@jcsoftdev/ui 0.2.2 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +292 -5
- package/README.md +2 -1
- package/bin/ui-theme.mjs +1151 -25
- package/dist/ai/attachment/attachment.js +1 -1
- package/dist/ai/chat-list/group.js +3 -1
- package/dist/ai/conversation/conversation.js +1 -1
- package/dist/ai/internal/use-copy.d.ts +1 -5
- package/dist/ai/internal/use-copy.js +1 -32
- package/dist/ai/markdown/parse.js +59 -17
- package/dist/ai/source/source.js +1 -1
- package/dist/atoms/avatar/avatar.d.ts +13 -3
- package/dist/atoms/avatar/avatar.js +40 -2
- package/dist/atoms/avatar/index.d.ts +1 -1
- package/dist/atoms/avatar/index.js +3 -1
- package/dist/atoms/button/button.d.ts +4 -1
- package/dist/atoms/button/button.js +4 -2
- package/dist/atoms/checkbox/checkbox.d.ts +8 -3
- package/dist/atoms/checkbox/checkbox.js +33 -6
- package/dist/atoms/chip/chip.d.ts +9 -3
- package/dist/atoms/chip/chip.js +26 -4
- package/dist/atoms/chip/index.d.ts +1 -1
- package/dist/atoms/chip/index.js +4 -1
- package/dist/atoms/status-dot/index.d.ts +1 -1
- package/dist/atoms/status-dot/status-dot.d.ts +4 -2
- package/dist/atoms/status-dot/status-dot.js +5 -1
- package/dist/charts/bar-chart/bar-race-chart.js +1 -0
- package/dist/charts/beeswarm-chart/beeswarm-chart.js +1 -1
- package/dist/charts/chord-chart/chord-chart.js +13 -5
- package/dist/charts/core/cartesian/cartesian-chart.d.ts +1 -1
- package/dist/charts/core/cartesian/cartesian-chart.js +48 -11
- package/dist/charts/core/cartesian/layout.d.ts +6 -1
- package/dist/charts/core/cartesian/layout.js +14 -5
- package/dist/charts/core/cartesian/marks.d.ts +2 -2
- package/dist/charts/core/cartesian/marks.js +1 -1
- package/dist/charts/core/cartesian/types.d.ts +28 -2
- package/dist/charts/core/category-explorer.d.ts +2 -2
- package/dist/charts/core/category-explorer.js +8 -4
- package/dist/charts/core/chart-dock.d.ts +26 -0
- package/dist/charts/core/chart-dock.js +45 -0
- package/dist/charts/core/chart-frame.d.ts +9 -2
- package/dist/charts/core/chart-frame.js +105 -25
- package/dist/charts/core/distribution/explorer.d.ts +5 -2
- package/dist/charts/core/distribution/explorer.js +12 -5
- package/dist/charts/core/distribution/xy-points.js +1 -1
- package/dist/charts/core/index.d.ts +3 -0
- package/dist/charts/core/index.js +3 -0
- package/dist/charts/core/leave-grace.d.ts +11 -0
- package/dist/charts/core/leave-grace.js +26 -0
- package/dist/charts/core/nearest.d.ts +14 -0
- package/dist/charts/core/nearest.js +22 -0
- package/dist/charts/core/plot-overlay.js +9 -3
- package/dist/charts/core/pointer.test-utils.d.ts +38 -0
- package/dist/charts/core/pointer.test-utils.js +123 -0
- package/dist/charts/core/tooltip.d.ts +25 -2
- package/dist/charts/core/tooltip.js +115 -40
- package/dist/charts/core/touch-select.d.ts +20 -0
- package/dist/charts/core/touch-select.js +184 -0
- package/dist/charts/core/types.d.ts +8 -4
- package/dist/charts/core/types.js +5 -0
- package/dist/charts/core/use-index-navigation.d.ts +17 -6
- package/dist/charts/core/use-index-navigation.js +47 -10
- package/dist/charts/donut-chart/donut-chart.d.ts +5 -1
- package/dist/charts/donut-chart/donut-chart.js +40 -1
- package/dist/charts/donut-chart/slice-labels.d.ts +20 -0
- package/dist/charts/donut-chart/slice-labels.js +20 -0
- package/dist/charts/dumbbell-chart/dumbbell-chart.js +6 -3
- package/dist/charts/fill-gauge-chart/fill-gauge-chart.js +1 -0
- package/dist/charts/funnel-chart/funnel-chart.js +2 -1
- package/dist/charts/gauge-chart/gauge-chart.js +2 -1
- package/dist/charts/heatmap-chart/heatmap-chart.d.ts +4 -1
- package/dist/charts/heatmap-chart/heatmap-chart.js +3 -1
- package/dist/charts/heatmap-chart/heatmap-grid.d.ts +4 -1
- package/dist/charts/heatmap-chart/heatmap-grid.js +3 -1
- package/dist/charts/hex-tile-map/hex-tile-map.js +124 -115
- package/dist/charts/hierarchy-morph/hierarchy-morph.js +2 -1
- package/dist/charts/icicle-chart/icicle-chart.js +7 -9
- package/dist/charts/lollipop-chart/lollipop-chart.js +6 -3
- package/dist/charts/maps/geo/map-viewport.js +1 -1
- package/dist/charts/polar-area-chart/polar-area-chart.js +42 -12
- package/dist/charts/progress-units/progress-units.js +1 -0
- package/dist/charts/radar-chart/radar-chart.js +1 -1
- package/dist/charts/radial-bar-chart/radial-bar-chart.js +2 -1
- package/dist/charts/range-area-chart/range-area-chart.js +3 -2
- package/dist/charts/sankey-chart/sankey-chart.js +12 -4
- package/dist/charts/tree-chart/tree-chart.js +1 -0
- package/dist/charts/treemap-chart/treemap-chart.js +2 -7
- package/dist/charts/waterfall-chart/waterfall-chart.js +6 -3
- package/dist/containers/action-bar/action-bar.d.ts +11 -2
- package/dist/containers/action-bar/action-bar.js +4 -1
- package/dist/containers/card/card.d.ts +21 -3
- package/dist/containers/card/card.js +20 -5
- package/dist/containers/grid/grid.d.ts +15 -0
- package/dist/containers/grid/grid.js +24 -0
- package/dist/containers/grid/index.d.ts +1 -0
- package/dist/containers/grid/index.js +4 -0
- package/dist/containers/index.d.ts +3 -0
- package/dist/containers/index.js +3 -0
- package/dist/containers/kpi/kpi.d.ts +13 -2
- package/dist/containers/kpi/kpi.js +86 -24
- package/dist/containers/kpi-group/index.d.ts +1 -1
- package/dist/containers/kpi-group/index.js +3 -1
- package/dist/containers/kpi-group/kpi-group.d.ts +9 -1
- package/dist/containers/kpi-group/kpi-group.js +11 -1
- package/dist/containers/page/index.d.ts +1 -0
- package/dist/containers/page/index.js +4 -0
- package/dist/containers/page/page.d.ts +7 -0
- package/dist/containers/page/page.js +14 -0
- package/dist/containers/page-header/page-header.d.ts +8 -3
- package/dist/containers/page-header/page-header.js +35 -8
- package/dist/containers/responsive-list/responsive-list.d.ts +1 -1
- package/dist/containers/responsive-list/responsive-list.js +6 -3
- package/dist/containers/stack/index.d.ts +1 -0
- package/dist/containers/stack/index.js +6 -0
- package/dist/containers/stack/stack.d.ts +15 -0
- package/dist/containers/stack/stack.js +43 -0
- package/dist/forms/copy-field/copy-field.d.ts +17 -0
- package/dist/forms/copy-field/copy-field.js +72 -0
- package/dist/forms/copy-field/index.d.ts +1 -0
- package/dist/forms/copy-field/index.js +4 -0
- package/dist/forms/emoji-picker/emoji-picker.js +1 -1
- package/dist/forms/form/form.d.ts +15 -0
- package/dist/forms/form/form.js +29 -0
- package/dist/forms/form/index.d.ts +1 -0
- package/dist/forms/form/index.js +10 -0
- package/dist/forms/index.d.ts +2 -0
- package/dist/forms/index.js +2 -0
- package/dist/forms/input/index.d.ts +1 -1
- package/dist/forms/input/index.js +3 -2
- package/dist/forms/input/input.d.ts +6 -2
- package/dist/forms/input/input.js +9 -3
- package/dist/glass/crystal-map.d.ts +70 -0
- package/dist/glass/crystal-map.js +88 -0
- package/dist/glass/displacement-map.d.ts +117 -0
- package/dist/glass/displacement-map.js +201 -0
- package/dist/glass/index.d.ts +8 -0
- package/dist/glass/index.js +63 -0
- package/dist/glass/lens-crystal.d.ts +29 -0
- package/dist/glass/lens-crystal.js +161 -0
- package/dist/glass/lens-dispersion.d.ts +11 -0
- package/dist/glass/lens-dispersion.js +19 -0
- package/dist/glass/liquid-glass.d.ts +41 -0
- package/dist/glass/liquid-glass.js +256 -0
- package/dist/glass/liquid-motion.d.ts +53 -0
- package/dist/glass/liquid-motion.js +302 -0
- package/dist/glass/liquid-options.d.ts +162 -0
- package/dist/glass/liquid-options.js +179 -0
- package/dist/glass/refraction.d.ts +100 -0
- package/dist/glass/refraction.js +714 -0
- package/dist/glass/specular-map.d.ts +26 -0
- package/dist/glass/specular-map.js +75 -0
- package/dist/glass/spring.d.ts +79 -0
- package/dist/glass/spring.js +58 -0
- package/dist/glass/support.d.ts +13 -0
- package/dist/glass/support.js +14 -0
- package/dist/glass/use-glass-refraction.d.ts +8 -0
- package/dist/glass/use-glass-refraction.js +16 -0
- package/dist/i18n/strings.d.ts +24 -0
- package/dist/i18n/strings.js +18 -2
- package/dist/icons/index.d.ts +2 -0
- package/dist/icons/index.js +4 -0
- package/dist/icons/key.d.ts +2 -0
- package/dist/icons/key.js +12 -0
- package/dist/icons/webhook.d.ts +2 -0
- package/dist/icons/webhook.js +12 -0
- package/dist/liquid/index.d.ts +3 -0
- package/dist/liquid/index.js +29 -0
- package/dist/navigation/breadcrumbs/breadcrumbs.d.ts +29 -0
- package/dist/navigation/breadcrumbs/breadcrumbs.js +70 -0
- package/dist/navigation/breadcrumbs/index.d.ts +1 -0
- package/dist/navigation/breadcrumbs/index.js +6 -0
- package/dist/navigation/index.d.ts +1 -0
- package/dist/navigation/index.js +1 -0
- package/dist/navigation/segmented/index.d.ts +1 -1
- package/dist/navigation/segmented/model.d.ts +5 -0
- package/dist/navigation/segmented/model.js +6 -0
- package/dist/navigation/segmented/segmented.d.ts +17 -3
- package/dist/navigation/segmented/segmented.js +20 -4
- package/dist/overlays/context-menu/context-menu.d.ts +9 -1
- package/dist/overlays/context-menu/context-menu.js +4 -1
- package/dist/overlays/dialog/dialog.d.ts +9 -1
- package/dist/overlays/dialog/dialog.js +3 -0
- package/dist/overlays/drawer/drawer.d.ts +9 -1
- package/dist/overlays/drawer/drawer.js +3 -0
- package/dist/overlays/dropdown-menu/dropdown-menu.d.ts +9 -1
- package/dist/overlays/dropdown-menu/dropdown-menu.js +3 -1
- package/dist/overlays/hover-card/hover-card.d.ts +10 -1
- package/dist/overlays/hover-card/hover-card.js +4 -1
- package/dist/overlays/popover/popover.d.ts +9 -1
- package/dist/overlays/popover/popover.js +3 -0
- package/dist/palette/command-palette/command-palette.d.ts +12 -2
- package/dist/palette/command-palette/command-palette.js +5 -0
- package/dist/primitives/command/command.d.ts +3 -2
- package/dist/primitives/command/command.js +2 -0
- package/dist/primitives/menu/menu.js +1 -1
- package/dist/primitives/popper/popper.js +5 -0
- package/dist/rich-text/rich-text-editor.js +94 -8
- package/dist/rich-text/sanitize.js +70 -20
- package/dist/shell/app-shell/app-shell.d.ts +17 -0
- package/dist/shell/app-shell/app-shell.js +44 -4
- package/dist/shell/bottom-nav/bottom-nav.d.ts +34 -0
- package/dist/shell/bottom-nav/bottom-nav.js +124 -0
- package/dist/shell/bottom-nav/index.d.ts +2 -0
- package/dist/shell/bottom-nav/index.js +9 -0
- package/dist/shell/bottom-nav/split.d.ts +11 -0
- package/dist/shell/bottom-nav/split.js +10 -0
- package/dist/shell/sidebar/sidebar.d.ts +16 -2
- package/dist/shell/sidebar/sidebar.js +46 -4
- package/dist/shell/topbar/topbar.d.ts +20 -9
- package/dist/shell/topbar/topbar.js +16 -9
- package/dist/states/empty-state/empty-state.d.ts +3 -1
- package/dist/states/empty-state/empty-state.js +9 -1
- package/dist/states/error-state/error-state.d.ts +3 -1
- package/dist/states/error-state/error-state.js +2 -0
- package/dist/states/index.d.ts +1 -0
- package/dist/states/index.js +1 -0
- package/dist/states/live-status-bar/index.d.ts +1 -0
- package/dist/states/live-status-bar/index.js +6 -0
- package/dist/states/live-status-bar/live-status-bar.d.ts +17 -0
- package/dist/states/live-status-bar/live-status-bar.js +49 -0
- package/dist/states/offline-banner/offline-banner.d.ts +3 -1
- package/dist/states/offline-banner/offline-banner.js +8 -4
- package/dist/utils/class-groups.js +17 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +2 -0
- package/dist/utils/material.d.ts +13 -0
- package/dist/utils/material.js +6 -0
- package/dist/utils/tone.d.ts +8 -0
- package/dist/utils/tone.js +17 -0
- package/dist/utils/use-copy.d.ts +5 -0
- package/dist/utils/use-copy.js +35 -0
- package/icons/svg/key.svg +5 -0
- package/icons/svg/webhook.svg +5 -0
- package/package.json +31 -21
- package/scripts/build-theme.d.mts +22 -0
- package/scripts/build-theme.mjs +236 -4
- package/src/ai/attachment/attachment.tsx +1 -1
- package/src/ai/chat-list/group.ts +3 -1
- package/src/ai/conversation/conversation.tsx +1 -1
- package/src/ai/internal/use-copy.ts +1 -38
- package/src/ai/markdown/parse.ts +74 -17
- package/src/ai/source/source.tsx +1 -1
- package/src/atoms/avatar/avatar.tsx +57 -4
- package/src/atoms/avatar/index.ts +8 -1
- package/src/atoms/button/button.tsx +8 -3
- package/src/atoms/checkbox/checkbox.tsx +44 -10
- package/src/atoms/chip/chip.tsx +37 -5
- package/src/atoms/chip/index.ts +7 -1
- package/src/atoms/status-dot/index.ts +1 -0
- package/src/atoms/status-dot/status-dot.tsx +15 -3
- package/src/charts/README.md +21 -0
- package/src/charts/bar-chart/bar-race-chart.tsx +1 -0
- package/src/charts/beeswarm-chart/beeswarm-chart.tsx +1 -1
- package/src/charts/chord-chart/chord-chart.tsx +13 -5
- package/src/charts/core/cartesian/cartesian-chart.tsx +55 -10
- package/src/charts/core/cartesian/layout.ts +29 -10
- package/src/charts/core/cartesian/marks.tsx +3 -3
- package/src/charts/core/cartesian/types.ts +30 -2
- package/src/charts/core/category-explorer.tsx +12 -6
- package/src/charts/core/chart-dock.tsx +68 -0
- package/src/charts/core/chart-frame.tsx +116 -27
- package/src/charts/core/distribution/explorer.tsx +17 -7
- package/src/charts/core/distribution/xy-points.tsx +1 -1
- package/src/charts/core/index.ts +3 -0
- package/src/charts/core/leave-grace.ts +35 -0
- package/src/charts/core/nearest.ts +38 -0
- package/src/charts/core/plot-overlay.tsx +9 -3
- package/src/charts/core/pointer.test-utils.ts +146 -0
- package/src/charts/core/tooltip.tsx +129 -15
- package/src/charts/core/touch-select.ts +250 -0
- package/src/charts/core/types.ts +13 -4
- package/src/charts/core/use-index-navigation.ts +70 -11
- package/src/charts/donut-chart/donut-chart.tsx +53 -3
- package/src/charts/donut-chart/slice-labels.ts +39 -0
- package/src/charts/dumbbell-chart/dumbbell-chart.tsx +8 -3
- package/src/charts/fill-gauge-chart/fill-gauge-chart.tsx +1 -0
- package/src/charts/funnel-chart/funnel-chart.tsx +2 -1
- package/src/charts/gauge-chart/gauge-chart.tsx +2 -1
- package/src/charts/heatmap-chart/heatmap-chart.tsx +5 -0
- package/src/charts/heatmap-chart/heatmap-grid.tsx +5 -1
- package/src/charts/hex-tile-map/hex-tile-map.tsx +6 -1
- package/src/charts/hierarchy-morph/hierarchy-morph.tsx +2 -1
- package/src/charts/icicle-chart/icicle-chart.tsx +8 -9
- package/src/charts/lollipop-chart/lollipop-chart.tsx +8 -3
- package/src/charts/maps/geo/map-viewport.tsx +1 -1
- package/src/charts/polar-area-chart/polar-area-chart.tsx +37 -12
- package/src/charts/progress-units/progress-units.tsx +1 -0
- package/src/charts/radar-chart/radar-chart.tsx +1 -1
- package/src/charts/radial-bar-chart/radial-bar-chart.tsx +2 -1
- package/src/charts/range-area-chart/range-area-chart.tsx +3 -2
- package/src/charts/sankey-chart/sankey-chart.tsx +12 -4
- package/src/charts/tree-chart/tree-chart.tsx +1 -0
- package/src/charts/treemap-chart/treemap-chart.tsx +2 -7
- package/src/charts/waterfall-chart/waterfall-chart.tsx +8 -3
- package/src/containers/action-bar/action-bar.tsx +13 -2
- package/src/containers/card/card.tsx +43 -4
- package/src/containers/grid/grid.tsx +37 -0
- package/src/containers/grid/index.ts +1 -0
- package/src/containers/index.ts +3 -0
- package/src/containers/kpi/kpi.tsx +116 -22
- package/src/containers/kpi-group/index.ts +7 -1
- package/src/containers/kpi-group/kpi-group.tsx +26 -1
- package/src/containers/page/index.ts +1 -0
- package/src/containers/page/page.tsx +17 -0
- package/src/containers/page-header/page-header.tsx +38 -8
- package/src/containers/responsive-list/responsive-list.tsx +7 -4
- package/src/containers/stack/index.ts +7 -0
- package/src/containers/stack/stack.tsx +55 -0
- package/src/forms/copy-field/copy-field.tsx +88 -0
- package/src/forms/copy-field/index.ts +1 -0
- package/src/forms/emoji-picker/emoji-picker.tsx +1 -1
- package/src/forms/form/form.tsx +46 -0
- package/src/forms/form/index.ts +8 -0
- package/src/forms/index.ts +2 -0
- package/src/forms/input/index.ts +1 -1
- package/src/forms/input/input.tsx +14 -3
- package/src/glass/crystal-map.ts +150 -0
- package/src/glass/displacement-map.ts +317 -0
- package/src/glass/index.ts +43 -0
- package/src/glass/lens-crystal.ts +226 -0
- package/src/glass/lens-dispersion.ts +34 -0
- package/src/glass/liquid-glass.tsx +371 -0
- package/src/glass/liquid-motion.ts +395 -0
- package/src/glass/liquid-options.ts +306 -0
- package/src/glass/refraction.ts +1010 -0
- package/src/glass/specular-map.ts +95 -0
- package/src/glass/spring.ts +98 -0
- package/src/glass/support.ts +27 -0
- package/src/glass/use-glass-refraction.ts +21 -0
- package/src/i18n/strings.ts +24 -0
- package/src/icons/index.ts +2 -0
- package/src/icons/key.tsx +13 -0
- package/src/icons/webhook.tsx +13 -0
- package/src/liquid/index.ts +24 -0
- package/src/navigation/breadcrumbs/breadcrumbs.tsx +103 -0
- package/src/navigation/breadcrumbs/index.ts +8 -0
- package/src/navigation/index.ts +1 -0
- package/src/navigation/segmented/index.ts +1 -0
- package/src/navigation/segmented/model.ts +11 -0
- package/src/navigation/segmented/segmented.tsx +45 -6
- package/src/overlays/context-menu/context-menu.tsx +11 -1
- package/src/overlays/dialog/dialog.tsx +10 -0
- package/src/overlays/drawer/drawer.tsx +10 -0
- package/src/overlays/dropdown-menu/dropdown-menu.tsx +10 -1
- package/src/overlays/hover-card/hover-card.tsx +12 -1
- package/src/overlays/popover/popover.tsx +10 -0
- package/src/palette/command-palette/command-palette.tsx +15 -1
- package/src/primitives/command/command.tsx +4 -0
- package/src/primitives/menu/menu.tsx +1 -1
- package/src/primitives/popper/popper.tsx +10 -0
- package/src/rich-text/rich-text-editor.tsx +116 -13
- package/src/rich-text/sanitize.ts +94 -23
- package/src/shell/app-shell/app-shell.tsx +60 -4
- package/src/shell/bottom-nav/bottom-nav.tsx +187 -0
- package/src/shell/bottom-nav/index.ts +8 -0
- package/src/shell/bottom-nav/split.ts +20 -0
- package/src/shell/sidebar/sidebar.tsx +51 -5
- package/src/shell/topbar/topbar.tsx +81 -58
- package/src/states/empty-state/empty-state.tsx +11 -1
- package/src/states/error-state/error-state.tsx +4 -0
- package/src/states/index.ts +1 -0
- package/src/states/live-status-bar/index.ts +6 -0
- package/src/states/live-status-bar/live-status-bar.tsx +62 -0
- package/src/states/offline-banner/offline-banner.tsx +13 -5
- package/src/utils/class-groups.ts +17 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/material.ts +16 -0
- package/src/utils/tone.ts +29 -0
- package/src/utils/use-copy.ts +38 -0
- package/styles/Theme.kt +64 -3
- package/styles/base.css +51 -0
- package/styles/tailwind.css +833 -0
- package/styles/theme.css +546 -4
- package/styles/tokens.css +788 -15
- package/tokens/default.json +918 -29
- package/scripts/build-theme.d.ts +0 -18
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
"use client";
|
|
2
|
+
|
|
3
|
+
import { type RefObject, useEffect, useRef } from "react";
|
|
4
|
+
import { TOUCH_TARGET } from "./chart-dock.js";
|
|
5
|
+
|
|
6
|
+
/** A finger that travels farther than this (px) is a swipe or scroll, never a selection. */
|
|
7
|
+
export const TAP_SLOP = 10;
|
|
8
|
+
|
|
9
|
+
/** Marks that can be the target of a tap: the hover targets charts flag, and category units. */
|
|
10
|
+
const MARK = "[data-chart-hit],[data-category]";
|
|
11
|
+
/** Details panel that stays pinned while it is read or scrolled. */
|
|
12
|
+
const KEEP = "[data-chart-dock],[data-chart-tooltip]";
|
|
13
|
+
const RING_DIRECTIONS = 8;
|
|
14
|
+
const RING_STEPS = 4;
|
|
15
|
+
|
|
16
|
+
type Point = { x: number; y: number };
|
|
17
|
+
interface Pin extends Point {
|
|
18
|
+
target: Element;
|
|
19
|
+
/** What the details read when the mark was pinned, to recognise a second tap on it. */
|
|
20
|
+
text: string | null;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** Events this hook replays, which it must not swallow or count as a finger again. */
|
|
24
|
+
const replayed = new WeakSet<Event>();
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Replays a hover. Entering keeps `touch` as the pointer type, so charts know a finger is on the
|
|
28
|
+
* mark (they snap with a wider radius); leaving is sent as `mouse`, which every leave handler obeys.
|
|
29
|
+
*/
|
|
30
|
+
function emit(
|
|
31
|
+
target: Element,
|
|
32
|
+
type: string,
|
|
33
|
+
at: Point,
|
|
34
|
+
related: Element | null,
|
|
35
|
+
pointerType: "mouse" | "touch" = "mouse",
|
|
36
|
+
) {
|
|
37
|
+
const event = new PointerEvent(type, {
|
|
38
|
+
bubbles: true,
|
|
39
|
+
cancelable: true,
|
|
40
|
+
composed: true,
|
|
41
|
+
clientX: at.x,
|
|
42
|
+
clientY: at.y,
|
|
43
|
+
pointerId: 1,
|
|
44
|
+
pointerType,
|
|
45
|
+
isPrimary: true,
|
|
46
|
+
relatedTarget: related,
|
|
47
|
+
});
|
|
48
|
+
replayed.add(event);
|
|
49
|
+
target.dispatchEvent(event);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Touch selection for every chart, in one place. On a touch screen the browser turns a tap into
|
|
54
|
+
* `pointerover`, `pointerdown`, `pointerup` and then `pointerout`, and a swipe into the same
|
|
55
|
+
* start followed by `pointercancel`, so hover handlers either flash and vanish or select while
|
|
56
|
+
* the page scrolls. This hook, attached to the plot element:
|
|
57
|
+
*
|
|
58
|
+
* - swallows touch `pointerover` / `pointerout`, so a lifted finger never counts as leaving;
|
|
59
|
+
* - on a tap (up within `TAP_SLOP` of the press) finds the mark under the finger, or the nearest
|
|
60
|
+
* one within `TOUCH_TARGET` px, and replays a mouse hover on it: the details are pinned;
|
|
61
|
+
* - tapping the pinned mark again (the details read the same), tapping outside the plot, tapping
|
|
62
|
+
* empty space or pressing Escape replays the mouse leaving, which unpins;
|
|
63
|
+
* - leaves the pinned mark alone while the page scrolls.
|
|
64
|
+
*
|
|
65
|
+
* Mouse and pen events pass through untouched. `details` reads the text the chart currently
|
|
66
|
+
* shows, which is how "the same mark" is recognised for charts with one hit area.
|
|
67
|
+
*/
|
|
68
|
+
export function useTouchSelection(
|
|
69
|
+
ref: RefObject<HTMLElement | null>,
|
|
70
|
+
details: () => string | null,
|
|
71
|
+
enabled = true,
|
|
72
|
+
) {
|
|
73
|
+
const read = useRef(details);
|
|
74
|
+
read.current = details;
|
|
75
|
+
|
|
76
|
+
useEffect(() => {
|
|
77
|
+
const root = ref.current;
|
|
78
|
+
if (!root || !enabled) return;
|
|
79
|
+
const host: HTMLElement = root;
|
|
80
|
+
let pin: Pin | null = null;
|
|
81
|
+
let press: (Point & { id: number; moved: boolean }) | null = null;
|
|
82
|
+
let settle = 0;
|
|
83
|
+
|
|
84
|
+
const inside = (element: Element | null): element is Element =>
|
|
85
|
+
element != null && element !== root && root.contains(element);
|
|
86
|
+
|
|
87
|
+
const markOf = (element: Element | null): Element | null => {
|
|
88
|
+
const mark = element?.closest(MARK) ?? null;
|
|
89
|
+
return inside(mark) ? mark : null;
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
const pick = (at: Point): Element | null => {
|
|
93
|
+
const marked = root.querySelector(MARK) != null;
|
|
94
|
+
const direct = document.elementFromPoint(at.x, at.y);
|
|
95
|
+
const mark = markOf(direct);
|
|
96
|
+
if (mark) return mark;
|
|
97
|
+
if (!marked) return inside(direct) ? direct : null;
|
|
98
|
+
for (let step = 1; step <= RING_STEPS; step += 1) {
|
|
99
|
+
const radius = (TOUCH_TARGET / RING_STEPS) * step;
|
|
100
|
+
for (let k = 0; k < RING_DIRECTIONS; k += 1) {
|
|
101
|
+
const angle = (k / RING_DIRECTIONS) * Math.PI * 2;
|
|
102
|
+
const near = markOf(
|
|
103
|
+
document.elementFromPoint(
|
|
104
|
+
at.x + Math.cos(angle) * radius,
|
|
105
|
+
at.y + Math.sin(angle) * radius,
|
|
106
|
+
),
|
|
107
|
+
);
|
|
108
|
+
if (near) return near;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return null;
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
const onKey = (event: KeyboardEvent) => {
|
|
115
|
+
if (event.key === "Escape") release();
|
|
116
|
+
};
|
|
117
|
+
const onOutside = (event: PointerEvent) => {
|
|
118
|
+
const target = event.target instanceof Element ? event.target : null;
|
|
119
|
+
if (!target || root.contains(target) || target.closest(KEEP)) return;
|
|
120
|
+
release();
|
|
121
|
+
};
|
|
122
|
+
|
|
123
|
+
function release() {
|
|
124
|
+
cancelAnimationFrame(settle);
|
|
125
|
+
document.removeEventListener("keydown", onKey, true);
|
|
126
|
+
document.removeEventListener("pointerdown", onOutside, true);
|
|
127
|
+
const gone = pin;
|
|
128
|
+
pin = null;
|
|
129
|
+
if (!gone) return;
|
|
130
|
+
// A re-render may have replaced the pinned node: leave from whatever is under it now.
|
|
131
|
+
const target = gone.target.isConnected
|
|
132
|
+
? gone.target
|
|
133
|
+
: inside(document.elementFromPoint(gone.x, gone.y))
|
|
134
|
+
? document.elementFromPoint(gone.x, gone.y)
|
|
135
|
+
: host.firstElementChild;
|
|
136
|
+
if (target) emit(target, "pointerout", gone, null);
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
const hold = () => {
|
|
140
|
+
if (pin?.target.isConnected) {
|
|
141
|
+
emit(pin.target, "pointerover", pin, null, "touch");
|
|
142
|
+
emit(pin.target, "pointermove", pin, null, "touch");
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* A swipe began or the browser took the gesture: undo what touch moves selected. It runs after
|
|
148
|
+
* the chart's own handlers have seen the event, so it has the last word.
|
|
149
|
+
*/
|
|
150
|
+
let undoing: ReturnType<typeof setTimeout> | undefined;
|
|
151
|
+
const abandon = (target: EventTarget | null) => {
|
|
152
|
+
if (undoing !== undefined) return;
|
|
153
|
+
undoing = setTimeout(() => {
|
|
154
|
+
undoing = undefined;
|
|
155
|
+
if (pin) hold();
|
|
156
|
+
else if (target instanceof Element && target.isConnected)
|
|
157
|
+
emit(target, "pointerout", { x: 0, y: 0 }, null);
|
|
158
|
+
}, 0);
|
|
159
|
+
};
|
|
160
|
+
|
|
161
|
+
const tap = (at: Point) => {
|
|
162
|
+
const mark = pick(at);
|
|
163
|
+
if (!mark) {
|
|
164
|
+
release();
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
const previous = pin;
|
|
168
|
+
if (previous && previous.target !== mark) emit(previous.target, "pointerout", previous, mark);
|
|
169
|
+
else if (!previous) {
|
|
170
|
+
document.addEventListener("keydown", onKey, true);
|
|
171
|
+
document.addEventListener("pointerdown", onOutside, true);
|
|
172
|
+
}
|
|
173
|
+
const next: Pin = { ...at, target: mark, text: null };
|
|
174
|
+
pin = next;
|
|
175
|
+
emit(mark, "pointerover", at, previous?.target ?? null, "touch");
|
|
176
|
+
emit(mark, "pointermove", at, null, "touch");
|
|
177
|
+
cancelAnimationFrame(settle);
|
|
178
|
+
settle = requestAnimationFrame(() => {
|
|
179
|
+
settle = requestAnimationFrame(() => {
|
|
180
|
+
if (pin !== next) return;
|
|
181
|
+
const text = read.current();
|
|
182
|
+
const again =
|
|
183
|
+
previous != null && (text != null ? text === previous.text : previous.target === mark);
|
|
184
|
+
if (again) release();
|
|
185
|
+
else next.text = text;
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
};
|
|
189
|
+
|
|
190
|
+
const swallow = (event: Event) => {
|
|
191
|
+
if ((event as PointerEvent).pointerType === "touch" && !replayed.has(event))
|
|
192
|
+
event.stopPropagation();
|
|
193
|
+
};
|
|
194
|
+
const onDown = (event: PointerEvent) => {
|
|
195
|
+
if (replayed.has(event)) return;
|
|
196
|
+
if (event.pointerType !== "touch") return;
|
|
197
|
+
if (press && press.id !== event.pointerId) press.moved = true;
|
|
198
|
+
else
|
|
199
|
+
press = {
|
|
200
|
+
x: event.clientX,
|
|
201
|
+
y: event.clientY,
|
|
202
|
+
id: event.pointerId,
|
|
203
|
+
moved: !event.isPrimary,
|
|
204
|
+
};
|
|
205
|
+
};
|
|
206
|
+
const onMove = (event: PointerEvent) => {
|
|
207
|
+
if (replayed.has(event)) return;
|
|
208
|
+
if (event.pointerType !== "touch" || !press || press.id !== event.pointerId) return;
|
|
209
|
+
if (!press.moved && Math.hypot(event.clientX - press.x, event.clientY - press.y) <= TAP_SLOP)
|
|
210
|
+
return;
|
|
211
|
+
press.moved = true;
|
|
212
|
+
};
|
|
213
|
+
const onCancel = (event: PointerEvent) => {
|
|
214
|
+
if (replayed.has(event)) return;
|
|
215
|
+
if (event.pointerType !== "touch") return;
|
|
216
|
+
if (press) abandon(event.target);
|
|
217
|
+
press = null;
|
|
218
|
+
};
|
|
219
|
+
const onUp = (event: PointerEvent) => {
|
|
220
|
+
if (replayed.has(event)) return;
|
|
221
|
+
if (event.pointerType !== "touch") return;
|
|
222
|
+
const current = press;
|
|
223
|
+
press = null;
|
|
224
|
+
if (!current || current.id !== event.pointerId) return;
|
|
225
|
+
if (current.moved) abandon(event.target);
|
|
226
|
+
else tap({ x: event.clientX, y: event.clientY });
|
|
227
|
+
};
|
|
228
|
+
|
|
229
|
+
const listen = (type: string, handler: (event: PointerEvent) => void) =>
|
|
230
|
+
root.addEventListener(type, handler as EventListener, true);
|
|
231
|
+
root.addEventListener("pointerover", swallow, true);
|
|
232
|
+
root.addEventListener("pointerout", swallow, true);
|
|
233
|
+
listen("pointerdown", onDown);
|
|
234
|
+
listen("pointermove", onMove);
|
|
235
|
+
listen("pointercancel", onCancel);
|
|
236
|
+
listen("pointerup", onUp);
|
|
237
|
+
return () => {
|
|
238
|
+
root.removeEventListener("pointerover", swallow, true);
|
|
239
|
+
root.removeEventListener("pointerout", swallow, true);
|
|
240
|
+
root.removeEventListener("pointerdown", onDown as EventListener, true);
|
|
241
|
+
root.removeEventListener("pointermove", onMove as EventListener, true);
|
|
242
|
+
root.removeEventListener("pointercancel", onCancel as EventListener, true);
|
|
243
|
+
root.removeEventListener("pointerup", onUp as EventListener, true);
|
|
244
|
+
cancelAnimationFrame(settle);
|
|
245
|
+
clearTimeout(undoing);
|
|
246
|
+
document.removeEventListener("keydown", onKey, true);
|
|
247
|
+
document.removeEventListener("pointerdown", onOutside, true);
|
|
248
|
+
};
|
|
249
|
+
}, [ref, enabled]);
|
|
250
|
+
}
|
package/src/charts/core/types.ts
CHANGED
|
@@ -85,11 +85,20 @@ export type ChartAnnotation =
|
|
|
85
85
|
/** Free text anchored at a data coordinate. */
|
|
86
86
|
| (AnnotationBase & { type: "text"; x: XValue; y: number; yAxis?: string });
|
|
87
87
|
|
|
88
|
+
/** An axis bound given as a number or as a function of the value the data would give. */
|
|
89
|
+
export type AxisBound = number | ((dataValue: number) => number);
|
|
90
|
+
|
|
91
|
+
/** The bound to use: `bound` itself, `bound(dataValue)` for a function, or `dataValue` when unset. */
|
|
92
|
+
export function resolveAxisBound(bound: AxisBound | undefined, dataValue: number): number {
|
|
93
|
+
if (bound == null) return dataValue;
|
|
94
|
+
return typeof bound === "function" ? bound(dataValue) : bound;
|
|
95
|
+
}
|
|
96
|
+
|
|
88
97
|
export interface ValueAxisOptions {
|
|
89
|
-
/** Fixed lower bound; by default the data decides (bars and areas start at 0). */
|
|
90
|
-
min?:
|
|
91
|
-
/** Fixed upper bound. */
|
|
92
|
-
max?:
|
|
98
|
+
/** Fixed lower bound, or a function of the data minimum; by default the data decides (bars and areas start at 0). */
|
|
99
|
+
min?: AxisBound;
|
|
100
|
+
/** Fixed upper bound, or a function of the data maximum, e.g. `(max) => Math.ceil(max / 400) * 400`. */
|
|
101
|
+
max?: AxisBound;
|
|
93
102
|
/** Approximate number of ticks; derived from the height by default. */
|
|
94
103
|
tickCount?: number;
|
|
95
104
|
/** Tick format; defaults to a short form of the chart `valueFormat`. */
|
|
@@ -1,17 +1,39 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
type FocusEvent,
|
|
5
|
+
type KeyboardEvent,
|
|
6
|
+
useCallback,
|
|
7
|
+
useEffect,
|
|
8
|
+
useRef,
|
|
9
|
+
useState,
|
|
10
|
+
} from "react";
|
|
11
|
+
import { useLeaveGrace } from "./leave-grace.js";
|
|
4
12
|
|
|
5
13
|
export interface IndexNavigationOptions {
|
|
6
14
|
/** Arrow keys wrap around the ends (circular charts). */
|
|
7
15
|
wrap?: boolean;
|
|
8
16
|
}
|
|
9
17
|
|
|
18
|
+
/** Attribute of the pointer targets whose press keeps a touch-pinned item instead of dismissing it. */
|
|
19
|
+
const CHART_HIT = "data-chart-hit";
|
|
20
|
+
|
|
21
|
+
interface HoverEvent {
|
|
22
|
+
clientX: number;
|
|
23
|
+
clientY: number;
|
|
24
|
+
/** `mouse`, `touch` or `pen`; absent for synthetic calls, which behave like a mouse. */
|
|
25
|
+
pointerType?: string;
|
|
26
|
+
}
|
|
27
|
+
|
|
10
28
|
/**
|
|
11
29
|
* Active-item state for charts made of discrete items (slices, axes, stages).
|
|
12
30
|
* One source of truth for pointer hover and keyboard focus, so the tooltip,
|
|
13
31
|
* the highlight and `aria-valuetext` always agree. `ref` goes on the
|
|
14
32
|
* positioned container: `hover` stores the pointer relative to it.
|
|
33
|
+
*
|
|
34
|
+
* A touch or pen press pins the item: lifting the finger fires `pointerleave`,
|
|
35
|
+
* which `pointerLeave` ignores for those pointers, so the details stay up
|
|
36
|
+
* until the next press outside a `CHART_HIT` target.
|
|
15
37
|
*/
|
|
16
38
|
export function useIndexNavigation<T extends HTMLElement = HTMLDivElement>(
|
|
17
39
|
count: number,
|
|
@@ -20,22 +42,56 @@ export function useIndexNavigation<T extends HTMLElement = HTMLDivElement>(
|
|
|
20
42
|
const ref = useRef<T>(null);
|
|
21
43
|
const [active, setActive] = useState<number | null>(null);
|
|
22
44
|
const [pointer, setPointer] = useState<{ x: number; y: number } | null>(null);
|
|
45
|
+
const [pinned, setPinned] = useState(false);
|
|
23
46
|
|
|
24
47
|
useEffect(() => {
|
|
25
48
|
setActive((current) => (current != null && current >= count ? null : current));
|
|
26
49
|
}, [count]);
|
|
27
50
|
|
|
28
|
-
const
|
|
29
|
-
const box = ref.current?.getBoundingClientRect();
|
|
30
|
-
if (!box) return;
|
|
31
|
-
setActive(index);
|
|
32
|
-
setPointer({ x: event.clientX - box.left, y: event.clientY - box.top });
|
|
33
|
-
}, []);
|
|
34
|
-
|
|
35
|
-
const leave = useCallback(() => {
|
|
51
|
+
const clear = useCallback(() => {
|
|
36
52
|
setActive(null);
|
|
37
53
|
setPointer(null);
|
|
54
|
+
setPinned(false);
|
|
38
55
|
}, []);
|
|
56
|
+
const { leave: leaveSoon, hold } = useLeaveGrace(clear);
|
|
57
|
+
|
|
58
|
+
const hover = useCallback(
|
|
59
|
+
(index: number, event: HoverEvent) => {
|
|
60
|
+
hold();
|
|
61
|
+
const box = ref.current?.getBoundingClientRect();
|
|
62
|
+
if (!box) return;
|
|
63
|
+
setActive(index);
|
|
64
|
+
setPointer({ x: event.clientX - box.left, y: event.clientY - box.top });
|
|
65
|
+
setPinned(event.pointerType != null && event.pointerType !== "mouse");
|
|
66
|
+
},
|
|
67
|
+
[hold],
|
|
68
|
+
);
|
|
69
|
+
|
|
70
|
+
const leave = useCallback(() => {
|
|
71
|
+
hold();
|
|
72
|
+
clear();
|
|
73
|
+
}, [hold, clear]);
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* `pointerleave` handler: a mouse leaving drops the item after a short grace (so crossing the
|
|
77
|
+
* gutter between two marks never shows an empty frame); a lifted finger or pen keeps it pinned.
|
|
78
|
+
*/
|
|
79
|
+
const pointerLeave = useCallback(
|
|
80
|
+
(event?: { pointerType?: string }) => {
|
|
81
|
+
if (event?.pointerType == null || event.pointerType === "mouse") leaveSoon();
|
|
82
|
+
},
|
|
83
|
+
[leaveSoon],
|
|
84
|
+
);
|
|
85
|
+
|
|
86
|
+
useEffect(() => {
|
|
87
|
+
if (!pinned) return;
|
|
88
|
+
const dismiss = (event: PointerEvent) => {
|
|
89
|
+
const target = event.target instanceof Element ? event.target : null;
|
|
90
|
+
if (!target?.closest(`[${CHART_HIT}]`) || !ref.current?.contains(target)) leave();
|
|
91
|
+
};
|
|
92
|
+
document.addEventListener("pointerdown", dismiss, true);
|
|
93
|
+
return () => document.removeEventListener("pointerdown", dismiss, true);
|
|
94
|
+
}, [pinned, leave]);
|
|
39
95
|
|
|
40
96
|
const onKeyDown = (event: KeyboardEvent<HTMLElement>) => {
|
|
41
97
|
if (count === 0) return;
|
|
@@ -60,9 +116,12 @@ export function useIndexNavigation<T extends HTMLElement = HTMLDivElement>(
|
|
|
60
116
|
|
|
61
117
|
const sliderProps = {
|
|
62
118
|
onKeyDown,
|
|
63
|
-
onFocus: (
|
|
119
|
+
onFocus: (event?: FocusEvent<HTMLElement>) => {
|
|
120
|
+
if (event && !event.currentTarget.matches(":focus-visible")) return;
|
|
121
|
+
setActive((current) => current ?? 0);
|
|
122
|
+
},
|
|
64
123
|
onBlur: leave,
|
|
65
124
|
};
|
|
66
125
|
|
|
67
|
-
return { ref, active, pointer, setActive, hover, leave, sliderProps };
|
|
126
|
+
return { ref, active, pointer, setActive, hover, leave, pointerLeave, sliderProps };
|
|
68
127
|
}
|
|
@@ -22,6 +22,7 @@ import { type ChartLabels, resolveLabels } from "../core/types.js";
|
|
|
22
22
|
import { useIndexNavigation } from "../core/use-index-navigation.js";
|
|
23
23
|
import { useSeriesState } from "../core/use-series-state.js";
|
|
24
24
|
import { fitCenterText } from "./center-fit.js";
|
|
25
|
+
import { fitSliceLabel } from "./slice-labels.js";
|
|
25
26
|
|
|
26
27
|
export interface DonutDatum {
|
|
27
28
|
/** Stable identity, used for keys and legend toggling. */
|
|
@@ -41,6 +42,9 @@ export type DonutFill = "solid" | "gradient" | "pattern";
|
|
|
41
42
|
|
|
42
43
|
export type DonutOutsideLabels = boolean | "name" | "percent" | "both";
|
|
43
44
|
|
|
45
|
+
/** Labels inside the ring: `true` and "percent" show the share, "value" the formatted value. */
|
|
46
|
+
export type DonutSliceLabels = boolean | "percent" | "value";
|
|
47
|
+
|
|
44
48
|
export interface DonutChartProps {
|
|
45
49
|
/** Accessible name of the drawing. */
|
|
46
50
|
title: string;
|
|
@@ -80,6 +84,8 @@ export interface DonutChartProps {
|
|
|
80
84
|
centerValue?: string;
|
|
81
85
|
/** Names / percentages on leader lines around the ring. `true` shows both. */
|
|
82
86
|
outsideLabels?: DonutOutsideLabels;
|
|
87
|
+
/** Labels drawn inside the ring; slices too small to hold their label are skipped. */
|
|
88
|
+
sliceLabels?: DonutSliceLabels;
|
|
83
89
|
legend?: boolean | "top" | "bottom";
|
|
84
90
|
tooltip?: boolean;
|
|
85
91
|
loading?: boolean;
|
|
@@ -135,6 +141,7 @@ export function DonutChart({
|
|
|
135
141
|
centerLabel,
|
|
136
142
|
centerValue,
|
|
137
143
|
outsideLabels = false,
|
|
144
|
+
sliceLabels = false,
|
|
138
145
|
legend,
|
|
139
146
|
tooltip = true,
|
|
140
147
|
loading = false,
|
|
@@ -263,6 +270,7 @@ export function DonutChart({
|
|
|
263
270
|
centerLabel={centerLabel ?? labels.total}
|
|
264
271
|
centerValue={centerValue}
|
|
265
272
|
outside={labelMode(outsideLabels)}
|
|
273
|
+
sliceLabels={sliceLabels}
|
|
266
274
|
tooltip={tooltip}
|
|
267
275
|
animate={animate}
|
|
268
276
|
labels={labels}
|
|
@@ -304,6 +312,7 @@ interface PlotProps {
|
|
|
304
312
|
onUp?: () => void;
|
|
305
313
|
centerValue?: string;
|
|
306
314
|
outside: "name" | "percent" | "both" | null;
|
|
315
|
+
sliceLabels: DonutSliceLabels;
|
|
307
316
|
tooltip: boolean;
|
|
308
317
|
animate: boolean;
|
|
309
318
|
labels: ChartLabels;
|
|
@@ -343,6 +352,7 @@ function DonutPlot({
|
|
|
343
352
|
centerLabel,
|
|
344
353
|
centerValue,
|
|
345
354
|
outside: outsideProp,
|
|
355
|
+
sliceLabels,
|
|
346
356
|
tooltip,
|
|
347
357
|
animate,
|
|
348
358
|
labels,
|
|
@@ -490,6 +500,31 @@ function DonutPlot({
|
|
|
490
500
|
return out;
|
|
491
501
|
}, [outside, visible, slices, items, cx, cy, radius, height]);
|
|
492
502
|
|
|
503
|
+
const insideLabels = useMemo(() => {
|
|
504
|
+
if (!sliceLabels) return [];
|
|
505
|
+
const fontSize = 11;
|
|
506
|
+
const out: Array<{ id: string; x: number; y: number; text: string }> = [];
|
|
507
|
+
for (const index of visible) {
|
|
508
|
+
const slice = slices[index];
|
|
509
|
+
const item = items[index];
|
|
510
|
+
if (!slice || !item) continue;
|
|
511
|
+
const text =
|
|
512
|
+
sliceLabels === "value"
|
|
513
|
+
? item.format(item.datum.value)
|
|
514
|
+
: formatPercent(slice.fraction, { decimals: 0 });
|
|
515
|
+
const fit = fitSliceLabel({
|
|
516
|
+
inner,
|
|
517
|
+
radius,
|
|
518
|
+
start: slice.start,
|
|
519
|
+
end: slice.end,
|
|
520
|
+
chars: text.length,
|
|
521
|
+
fontSize,
|
|
522
|
+
});
|
|
523
|
+
if (fit) out.push({ id: item.datum.id, x: cx + fit.x, y: cy + fit.y, text });
|
|
524
|
+
}
|
|
525
|
+
return out;
|
|
526
|
+
}, [sliceLabels, visible, slices, items, inner, radius, cx, cy]);
|
|
527
|
+
|
|
493
528
|
// Motion -------------------------------------------------------------------
|
|
494
529
|
useEntryAnimation(
|
|
495
530
|
svgRef,
|
|
@@ -615,6 +650,20 @@ function DonutPlot({
|
|
|
615
650
|
);
|
|
616
651
|
})}
|
|
617
652
|
|
|
653
|
+
{insideLabels.map((label) => (
|
|
654
|
+
<text
|
|
655
|
+
key={label.id}
|
|
656
|
+
x={label.x}
|
|
657
|
+
y={label.y}
|
|
658
|
+
textAnchor="middle"
|
|
659
|
+
dominantBaseline="central"
|
|
660
|
+
pointerEvents="none"
|
|
661
|
+
className="fill-surface font-bold text-fs-110 tabular-nums"
|
|
662
|
+
>
|
|
663
|
+
{label.text}
|
|
664
|
+
</text>
|
|
665
|
+
))}
|
|
666
|
+
|
|
618
667
|
{outsideLabels.map((label) => {
|
|
619
668
|
const dimmed = focusIndex != null && items[focusIndex]?.datum.id !== label.id;
|
|
620
669
|
const avail = Math.max(24, (label.side > 0 ? width - label.x : label.x) - 6);
|
|
@@ -676,7 +725,7 @@ function DonutPlot({
|
|
|
676
725
|
d={d}
|
|
677
726
|
clickable={onSliceClick != null}
|
|
678
727
|
onEnter={(event) => nav.hover(position, event)}
|
|
679
|
-
onLeave={nav.
|
|
728
|
+
onLeave={nav.pointerLeave}
|
|
680
729
|
onClick={onSliceClick ? () => onSliceClick(item.datum) : undefined}
|
|
681
730
|
/>
|
|
682
731
|
);
|
|
@@ -781,8 +830,8 @@ const SliceMark = memo(function SliceMark({
|
|
|
781
830
|
interface SliceHitAreaProps {
|
|
782
831
|
d: string;
|
|
783
832
|
clickable: boolean;
|
|
784
|
-
onEnter: (event: { clientX: number; clientY: number }) => void;
|
|
785
|
-
onLeave: () => void;
|
|
833
|
+
onEnter: (event: { clientX: number; clientY: number; pointerType?: string }) => void;
|
|
834
|
+
onLeave: (event: { pointerType?: string }) => void;
|
|
786
835
|
onClick?: () => void;
|
|
787
836
|
}
|
|
788
837
|
|
|
@@ -792,6 +841,7 @@ function SliceHitArea({ d, clickable, onEnter, onLeave, onClick }: SliceHitAreaP
|
|
|
792
841
|
// biome-ignore lint/a11y/noStaticElementInteractions: pointer hover only; keyboard goes through the chart slider.
|
|
793
842
|
<path
|
|
794
843
|
data-slice-hit=""
|
|
844
|
+
data-chart-hit=""
|
|
795
845
|
d={d}
|
|
796
846
|
fill="transparent"
|
|
797
847
|
onPointerEnter={onEnter}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
const CHAR_WIDTH_EM = 0.6;
|
|
2
|
+
const FILL_RATIO = 0.92;
|
|
3
|
+
|
|
4
|
+
export interface SliceLabelInput {
|
|
5
|
+
/** Radius of the hole (0 for a pie). */
|
|
6
|
+
inner: number;
|
|
7
|
+
radius: number;
|
|
8
|
+
/** Angles in radians from 12 o'clock, clockwise. */
|
|
9
|
+
start: number;
|
|
10
|
+
end: number;
|
|
11
|
+
chars: number;
|
|
12
|
+
fontSize: number;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export interface SliceLabelFit {
|
|
16
|
+
x: number;
|
|
17
|
+
y: number;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Where a horizontal label sits inside a ring slice, relative to the centre, or null when the text
|
|
22
|
+
* does not fit: the box is projected on the radial and the tangential direction of the slice and
|
|
23
|
+
* must stay within the ring thickness and the arc length at its middle radius.
|
|
24
|
+
*/
|
|
25
|
+
export function fitSliceLabel(input: SliceLabelInput): SliceLabelFit | null {
|
|
26
|
+
const { inner, radius, start, end, chars, fontSize } = input;
|
|
27
|
+
const mid = (start + end) / 2;
|
|
28
|
+
const at = inner <= 0 ? radius * 0.62 : (inner + radius) / 2;
|
|
29
|
+
const thickness = inner <= 0 ? radius * 0.7 : radius - inner;
|
|
30
|
+
const arc = (end - start) * at;
|
|
31
|
+
const width = chars * fontSize * CHAR_WIDTH_EM;
|
|
32
|
+
const height = fontSize * 1.1;
|
|
33
|
+
const rx = Math.sin(mid);
|
|
34
|
+
const ry = -Math.cos(mid);
|
|
35
|
+
const radial = width * Math.abs(rx) + height * Math.abs(ry);
|
|
36
|
+
const tangent = width * Math.abs(ry) + height * Math.abs(rx);
|
|
37
|
+
if (radial > thickness * FILL_RATIO || tangent > arc * FILL_RATIO) return null;
|
|
38
|
+
return { x: at * rx, y: at * ry };
|
|
39
|
+
}
|
|
@@ -16,7 +16,12 @@ import { DIRECTION_COLORS, directionOf, seriesColor } from "../core/palette.js";
|
|
|
16
16
|
import { PlotOverlay } from "../core/plot-overlay.js";
|
|
17
17
|
import { linearScale } from "../core/scales/linear.js";
|
|
18
18
|
import { ChartTooltip, type TooltipRow } from "../core/tooltip.js";
|
|
19
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
type ChartLabels,
|
|
21
|
+
resolveAxisBound,
|
|
22
|
+
resolveLabels,
|
|
23
|
+
type ValueAxisOptions,
|
|
24
|
+
} from "../core/types.js";
|
|
20
25
|
|
|
21
26
|
export interface DumbbellItem {
|
|
22
27
|
id?: string;
|
|
@@ -404,8 +409,8 @@ function DumbbellPlot({
|
|
|
404
409
|
const lo = all.length ? Math.min(...all) : 0;
|
|
405
410
|
const hi = all.length ? Math.max(...all) : 1;
|
|
406
411
|
const domain: [number, number] = [
|
|
407
|
-
xAxis?.min
|
|
408
|
-
xAxis?.max
|
|
412
|
+
resolveAxisBound(xAxis?.min, lo > 0 && lo < hi * 0.4 ? 0 : lo),
|
|
413
|
+
resolveAxisBound(xAxis?.max, hi),
|
|
409
414
|
];
|
|
410
415
|
const format = resolveAxisFormat(xAxis?.format ?? valueFormat);
|
|
411
416
|
if (vertical) {
|
|
@@ -347,7 +347,7 @@ function FunnelPlot({
|
|
|
347
347
|
opacity={shape.opacity}
|
|
348
348
|
dimmed={active != null && active !== i}
|
|
349
349
|
onEnter={(event) => nav.hover(i, event)}
|
|
350
|
-
onLeave={nav.
|
|
350
|
+
onLeave={nav.pointerLeave}
|
|
351
351
|
/>
|
|
352
352
|
))}
|
|
353
353
|
|
|
@@ -498,6 +498,7 @@ const StageMark = memo(function StageMark({
|
|
|
498
498
|
return (
|
|
499
499
|
<polygon
|
|
500
500
|
data-stage=""
|
|
501
|
+
data-chart-hit=""
|
|
501
502
|
points={points}
|
|
502
503
|
strokeWidth={2}
|
|
503
504
|
strokeLinejoin="round"
|
|
@@ -433,7 +433,7 @@ function GaugePlot({
|
|
|
433
433
|
opacity={needle ? 0.92 : focused === index ? 0.32 : 0}
|
|
434
434
|
dimmed={needle && focused != null && focused !== index}
|
|
435
435
|
onEnter={(event) => nav.hover(index, event)}
|
|
436
|
-
onLeave={nav.
|
|
436
|
+
onLeave={nav.pointerLeave}
|
|
437
437
|
/>
|
|
438
438
|
);
|
|
439
439
|
})}
|
|
@@ -617,6 +617,7 @@ const BandMark = memo(function BandMark({
|
|
|
617
617
|
return (
|
|
618
618
|
<path
|
|
619
619
|
data-band=""
|
|
620
|
+
data-chart-hit=""
|
|
620
621
|
d={d}
|
|
621
622
|
fill="none"
|
|
622
623
|
strokeWidth={width}
|
|
@@ -6,6 +6,7 @@ import type { ColorRange, ScaleColors } from "../core/color-scale.js";
|
|
|
6
6
|
import { ChartDataTable } from "../core/data-table.js";
|
|
7
7
|
import { resolveFormat, type ValueFormat } from "../core/format.js";
|
|
8
8
|
import { formatDate } from "../core/scales/time.js";
|
|
9
|
+
import type { TooltipRow } from "../core/tooltip.js";
|
|
9
10
|
import { datetimeColumnLabels } from "./datetime-columns.js";
|
|
10
11
|
import {
|
|
11
12
|
type HeatmapCellInfo,
|
|
@@ -63,6 +64,8 @@ export interface HeatmapChartProps {
|
|
|
63
64
|
loading?: boolean;
|
|
64
65
|
labels?: Partial<HeatmapLabels>;
|
|
65
66
|
onCellClick?: (cell: HeatmapCellInfo) => void;
|
|
67
|
+
/** Extra tooltip rows for a cell, shown under its value, e.g. an amount next to a count. */
|
|
68
|
+
cellDetail?: (row: number, column: number, value: number | null) => readonly TooltipRow[];
|
|
66
69
|
className?: string;
|
|
67
70
|
}
|
|
68
71
|
|
|
@@ -96,6 +99,7 @@ export function HeatmapChart({
|
|
|
96
99
|
loading,
|
|
97
100
|
labels: labelsProp,
|
|
98
101
|
onCellClick,
|
|
102
|
+
cellDetail,
|
|
99
103
|
className,
|
|
100
104
|
}: HeatmapChartProps) {
|
|
101
105
|
const labels = resolveHeatmapLabels(labelsProp);
|
|
@@ -182,6 +186,7 @@ export function HeatmapChart({
|
|
|
182
186
|
tooltip={tooltip}
|
|
183
187
|
animate={animate}
|
|
184
188
|
onCellClick={onCellClick}
|
|
189
|
+
cellDetail={cellDetail}
|
|
185
190
|
/>
|
|
186
191
|
)}
|
|
187
192
|
</ChartFrame>
|