@elastic/charts 40.1.1 → 42.0.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 +69 -3
- package/dist/chart_types/goal_chart/layout/config/config.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js +3 -5
- package/dist/chart_types/goal_chart/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/geoms.js +22 -22
- package/dist/chart_types/goal_chart/layout/viewmodel/geoms.js.map +1 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js +2 -1
- package/dist/chart_types/goal_chart/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.d.ts +10 -13
- package/dist/chart_types/goal_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/goal_chart/specs/index.js +5 -2
- package/dist/chart_types/goal_chart/specs/index.js.map +1 -1
- package/dist/chart_types/goal_chart/state/selectors/geometries.js +2 -2
- package/dist/chart_types/goal_chart/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/goal_chart/state/selectors/scenegraph.js +1 -22
- package/dist/chart_types/goal_chart/state/selectors/scenegraph.js.map +1 -1
- package/dist/chart_types/goal_chart/state/selectors/tooltip.js +4 -3
- package/dist/chart_types/goal_chart/state/selectors/tooltip.js.map +1 -1
- package/dist/chart_types/heatmap/layout/types/viewmodel_types.d.ts.map +1 -1
- package/dist/chart_types/heatmap/layout/types/viewmodel_types.js +4 -3
- package/dist/chart_types/heatmap/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/heatmap/{state/selectors → layout/viewmodel}/scenegraph.d.ts +0 -0
- package/dist/chart_types/heatmap/layout/viewmodel/scenegraph.d.ts.map +1 -0
- package/dist/chart_types/heatmap/layout/viewmodel/scenegraph.js +12 -0
- package/dist/chart_types/heatmap/layout/viewmodel/scenegraph.js.map +1 -0
- package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.d.ts.map +1 -1
- package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.js +87 -52
- package/dist/chart_types/heatmap/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/canvas/canvas_renderers.js +42 -22
- package/dist/chart_types/heatmap/renderer/canvas/canvas_renderers.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/canvas/connected_component.js +15 -3
- package/dist/chart_types/heatmap/renderer/canvas/connected_component.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/dom/highlighter.js +3 -3
- package/dist/chart_types/heatmap/renderer/dom/highlighter.js.map +1 -1
- package/dist/chart_types/heatmap/renderer/dom/highlighter_brush.js +4 -4
- package/dist/chart_types/heatmap/renderer/dom/highlighter_brush.js.map +1 -1
- package/dist/chart_types/heatmap/specs/heatmap.d.ts +32 -13
- package/dist/chart_types/heatmap/specs/heatmap.d.ts.map +1 -1
- package/dist/chart_types/heatmap/specs/heatmap.js +41 -23
- package/dist/chart_types/heatmap/specs/heatmap.js.map +1 -1
- package/dist/chart_types/heatmap/state/chart_state.js +4 -3
- package/dist/chart_types/heatmap/state/chart_state.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/compute_chart_dimensions.js +96 -61
- package/dist/chart_types/heatmap/state/selectors/compute_chart_dimensions.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/compute_legend.js +3 -2
- package/dist/chart_types/heatmap/state/selectors/compute_legend.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/geometries.js +9 -11
- package/dist/chart_types/heatmap/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_brush_area.js +6 -8
- package/dist/chart_types/heatmap/state/selectors/get_brush_area.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_brushed_highlighted_shapes.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_brushed_highlighted_shapes.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_debug_state.js +10 -2
- package/dist/chart_types/heatmap/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_container_size.js +3 -3
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_container_size.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_spec.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_table.js +6 -8
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_table.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_highlighted_area.js +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_highlighted_area.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_picked_cells.js +5 -7
- package/dist/chart_types/heatmap/state/selectors/get_picked_cells.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_tooltip_anchor.js +4 -3
- package/dist/chart_types/heatmap/state/selectors/get_tooltip_anchor.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/get_x_axis_right_overflow.js +21 -7
- package/dist/chart_types/heatmap/state/selectors/get_x_axis_right_overflow.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/is_brush_available.js +5 -4
- package/dist/chart_types/heatmap/state/selectors/is_brush_available.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/is_empty.d.ts +2 -0
- package/dist/chart_types/heatmap/state/selectors/is_empty.d.ts.map +1 -0
- package/dist/chart_types/heatmap/state/selectors/is_empty.js +9 -0
- package/dist/chart_types/heatmap/state/selectors/is_empty.js.map +1 -0
- package/dist/chart_types/heatmap/state/selectors/on_brush_end_caller.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/picked_shapes.js +3 -3
- package/dist/chart_types/heatmap/state/selectors/picked_shapes.js.map +1 -1
- package/dist/chart_types/heatmap/state/selectors/tooltip.js +5 -6
- package/dist/chart_types/heatmap/state/selectors/tooltip.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/config.d.ts +2 -0
- package/dist/chart_types/partition_chart/layout/config.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/layout/config.js +5 -6
- package/dist/chart_types/partition_chart/layout/config.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/config.d.ts +56 -0
- package/dist/chart_types/partition_chart/layout/types/config.d.ts.map +1 -0
- package/dist/chart_types/{wordcloud/layout/types/config_types.js → partition_chart/layout/types/config.js} +1 -1
- package/dist/chart_types/partition_chart/layout/types/config.js.map +1 -0
- package/dist/chart_types/partition_chart/layout/types/config_types.d.ts +5 -86
- package/dist/chart_types/partition_chart/layout/types/config_types.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/config_types.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/viewmodel_types.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/layout/types/viewmodel_types.js +46 -34
- package/dist/chart_types/partition_chart/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/utils/circline_geometry.js +3 -2
- package/dist/chart_types/partition_chart/layout/utils/circline_geometry.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/fill_text_layout.js +7 -9
- package/dist/chart_types/partition_chart/layout/viewmodel/fill_text_layout.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/hierarchy_of_arrays.js +3 -4
- package/dist/chart_types/partition_chart/layout/viewmodel/hierarchy_of_arrays.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/link_text_layout.js +8 -7
- package/dist/chart_types/partition_chart/layout/viewmodel/link_text_layout.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/scenegraph.js +5 -26
- package/dist/chart_types/partition_chart/layout/viewmodel/scenegraph.js.map +1 -1
- package/dist/chart_types/partition_chart/layout/viewmodel/viewmodel.js +31 -27
- package/dist/chart_types/partition_chart/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_linear_renderers.js +2 -2
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_linear_renderers.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_renderers.js +7 -9
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_renderers.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_wrapped_renderers.js +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/canvas_wrapped_renderers.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/canvas/partition.js +6 -6
- package/dist/chart_types/partition_chart/renderer/canvas/partition.js.map +1 -1
- package/dist/chart_types/partition_chart/renderer/dom/highlighter.js +7 -8
- package/dist/chart_types/partition_chart/renderer/dom/highlighter.js.map +1 -1
- package/dist/chart_types/partition_chart/specs/index.d.ts +37 -15
- package/dist/chart_types/partition_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/partition_chart/specs/index.js +33 -5
- package/dist/chart_types/partition_chart/specs/index.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/compute_legend.js +1 -1
- package/dist/chart_types/partition_chart/state/selectors/compute_legend.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/drilldown_active.js +4 -2
- package/dist/chart_types/partition_chart/state/selectors/drilldown_active.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/geometries.js +18 -24
- package/dist/chart_types/partition_chart/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/get_chart_type_description.js +1 -1
- package/dist/chart_types/partition_chart/state/selectors/get_chart_type_description.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/get_debug_state.js +2 -2
- package/dist/chart_types/partition_chart/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/partition_chart/state/selectors/tree.js +3 -6
- package/dist/chart_types/partition_chart/state/selectors/tree.js.map +1 -1
- package/dist/chart_types/specs.d.ts +1 -1
- package/dist/chart_types/specs.d.ts.map +1 -1
- package/dist/chart_types/specs.js.map +1 -1
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.d.ts +11 -11
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.d.ts.map +1 -1
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.js +2 -4
- package/dist/chart_types/wordcloud/layout/types/viewmodel_types.js.map +1 -1
- package/dist/chart_types/wordcloud/layout/viewmodel/viewmodel.js +5 -5
- package/dist/chart_types/wordcloud/layout/viewmodel/viewmodel.js.map +1 -1
- package/dist/chart_types/wordcloud/renderer/svg/connected_component.js +37 -54
- package/dist/chart_types/wordcloud/renderer/svg/connected_component.js.map +1 -1
- package/dist/chart_types/wordcloud/specs/index.d.ts +12 -26
- package/dist/chart_types/wordcloud/specs/index.d.ts.map +1 -1
- package/dist/chart_types/wordcloud/specs/index.js +4 -3
- package/dist/chart_types/wordcloud/specs/index.js.map +1 -1
- package/dist/chart_types/wordcloud/state/selectors/geometries.js +3 -2
- package/dist/chart_types/wordcloud/state/selectors/geometries.js.map +1 -1
- package/dist/chart_types/wordcloud/state/selectors/scenegraph.js +2 -16
- package/dist/chart_types/wordcloud/state/selectors/scenegraph.js.map +1 -1
- package/dist/chart_types/xy_chart/annotations/types.d.ts +1 -1
- package/dist/chart_types/xy_chart/annotations/types.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js +26 -13
- package/dist/chart_types/xy_chart/renderer/canvas/areas.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js +14 -6
- package/dist/chart_types/xy_chart/renderer/canvas/lines.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/primitives/path.js +6 -21
- package/dist/chart_types/xy_chart/renderer/canvas/primitives/path.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/primitives/text.js +3 -36
- package/dist/chart_types/xy_chart/renderer/canvas/primitives/text.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js +2 -1
- package/dist/chart_types/xy_chart/renderer/canvas/renderers.js.map +1 -1
- package/dist/chart_types/xy_chart/renderer/canvas/values/bar.js +6 -5
- package/dist/chart_types/xy_chart/renderer/canvas/values/bar.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/area.js +4 -7
- package/dist/chart_types/xy_chart/rendering/area.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/bars.js +80 -83
- package/dist/chart_types/xy_chart/rendering/bars.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/bubble.js +1 -1
- package/dist/chart_types/xy_chart/rendering/bubble.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/line.js +4 -5
- package/dist/chart_types/xy_chart/rendering/line.js.map +1 -1
- package/dist/chart_types/xy_chart/rendering/points.js +2 -3
- package/dist/chart_types/xy_chart/rendering/points.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/area_series.d.ts +10 -5
- package/dist/chart_types/xy_chart/specs/area_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/area_series.js +20 -4
- package/dist/chart_types/xy_chart/specs/area_series.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/axis.d.ts +7 -5
- package/dist/chart_types/xy_chart/specs/axis.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/axis.js +3 -2
- package/dist/chart_types/xy_chart/specs/axis.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/bar_series.d.ts +10 -5
- package/dist/chart_types/xy_chart/specs/bar_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/bar_series.js +20 -4
- package/dist/chart_types/xy_chart/specs/bar_series.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/bubble_series.d.ts +9 -13
- package/dist/chart_types/xy_chart/specs/bubble_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/bubble_series.js +20 -4
- package/dist/chart_types/xy_chart/specs/bubble_series.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/histogram_bar_series.d.ts +10 -5
- package/dist/chart_types/xy_chart/specs/histogram_bar_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/histogram_bar_series.js +20 -4
- package/dist/chart_types/xy_chart/specs/histogram_bar_series.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/index.d.ts +8 -8
- package/dist/chart_types/xy_chart/specs/index.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/index.js +18 -17
- package/dist/chart_types/xy_chart/specs/index.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/line_annotation.d.ts +9 -4
- package/dist/chart_types/xy_chart/specs/line_annotation.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/line_annotation.js +20 -2
- package/dist/chart_types/xy_chart/specs/line_annotation.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/line_series.d.ts +10 -5
- package/dist/chart_types/xy_chart/specs/line_series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/line_series.js +20 -4
- package/dist/chart_types/xy_chart/specs/line_series.js.map +1 -1
- package/dist/chart_types/xy_chart/specs/rect_annotation.d.ts +4 -2
- package/dist/chart_types/xy_chart/specs/rect_annotation.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/specs/rect_annotation.js +3 -3
- package/dist/chart_types/xy_chart/specs/rect_annotation.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.js +7 -1
- package/dist/chart_types/xy_chart/state/selectors/compute_axis_ticks_dimensions.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/compute_series_geometries.js +6 -1
- package/dist/chart_types/xy_chart/state/selectors/compute_series_geometries.js.map +1 -1
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js +10 -9
- package/dist/chart_types/xy_chart/state/selectors/get_debug_state.js.map +1 -1
- package/dist/chart_types/xy_chart/state/utils/utils.js +6 -6
- package/dist/chart_types/xy_chart/state/utils/utils.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/series.d.ts +4 -2
- package/dist/chart_types/xy_chart/utils/series.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/utils/series.js.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.d.ts +40 -28
- package/dist/chart_types/xy_chart/utils/specs.d.ts.map +1 -1
- package/dist/chart_types/xy_chart/utils/specs.js.map +1 -1
- package/dist/common/color_library_wrappers.d.ts +4 -3
- package/dist/common/color_library_wrappers.d.ts.map +1 -1
- package/dist/common/color_library_wrappers.js.map +1 -1
- package/dist/common/colors.js.map +1 -1
- package/dist/common/fill_text_color.js +13 -6
- package/dist/common/fill_text_color.js.map +1 -1
- package/dist/common/text_utils.d.ts.map +1 -1
- package/dist/common/text_utils.js +5 -25
- package/dist/common/text_utils.js.map +1 -1
- package/dist/components/accessibility/partitions_data_table.js +1 -1
- package/dist/components/accessibility/partitions_data_table.js.map +1 -1
- package/dist/components/accessibility/types.js +1 -1
- package/dist/components/accessibility/types.js.map +1 -1
- package/dist/components/legend/utils.js +1 -1
- package/dist/components/legend/utils.js.map +1 -1
- package/dist/index.d.ts +8 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/specs/constants.d.ts +2 -0
- package/dist/specs/constants.d.ts.map +1 -1
- package/dist/specs/constants.js +10 -3
- package/dist/specs/constants.js.map +1 -1
- package/dist/specs/group_by.d.ts +17 -11
- package/dist/specs/group_by.d.ts.map +1 -1
- package/dist/specs/group_by.js +19 -2
- package/dist/specs/group_by.js.map +1 -1
- package/dist/specs/settings.d.ts +22 -13
- package/dist/specs/settings.d.ts.map +1 -1
- package/dist/specs/settings.js +18 -1
- package/dist/specs/settings.js.map +1 -1
- package/dist/specs/small_multiples.d.ts +8 -5
- package/dist/specs/small_multiples.d.ts.map +1 -1
- package/dist/specs/small_multiples.js +4 -4
- package/dist/specs/small_multiples.js.map +1 -1
- package/dist/state/selectors/get_chart_theme.js +13 -2
- package/dist/state/selectors/get_chart_theme.js.map +1 -1
- package/dist/state/selectors/get_legend_config_selector.js +2 -1
- package/dist/state/selectors/get_legend_config_selector.js.map +1 -1
- package/dist/state/selectors/get_legend_size.js +12 -3
- package/dist/state/selectors/get_legend_size.js.map +1 -1
- package/dist/state/spec_factory.d.ts +24 -0
- package/dist/state/spec_factory.d.ts.map +1 -1
- package/dist/state/spec_factory.js +36 -32
- package/dist/state/spec_factory.js.map +1 -1
- package/dist/utils/accessor.d.ts +17 -7
- package/dist/utils/accessor.d.ts.map +1 -1
- package/dist/utils/accessor.js +6 -1
- package/dist/utils/accessor.js.map +1 -1
- package/dist/utils/bbox/canvas_text_bbox_calculator.js +15 -16
- package/dist/utils/bbox/canvas_text_bbox_calculator.js.map +1 -1
- package/dist/utils/common.d.ts +2 -1
- package/dist/utils/common.d.ts.map +1 -1
- package/dist/utils/common.js +11 -1
- package/dist/utils/common.js.map +1 -1
- package/dist/utils/dimensions.d.ts +7 -3
- package/dist/utils/dimensions.d.ts.map +1 -1
- package/dist/utils/dimensions.js +16 -1
- package/dist/utils/dimensions.js.map +1 -1
- package/dist/utils/geometry.js.map +1 -1
- package/dist/utils/themes/dark_theme.d.ts.map +1 -1
- package/dist/utils/themes/dark_theme.js +157 -2
- package/dist/utils/themes/dark_theme.js.map +1 -1
- package/dist/utils/themes/light_theme.d.ts.map +1 -1
- package/dist/utils/themes/light_theme.js +154 -0
- package/dist/utils/themes/light_theme.js.map +1 -1
- package/dist/utils/themes/partition.d.ts +73 -0
- package/dist/utils/themes/partition.d.ts.map +1 -0
- package/dist/{chart_types/heatmap/layout/types/config_types.js → utils/themes/partition.js} +1 -1
- package/dist/utils/themes/partition.js.map +1 -0
- package/dist/utils/themes/theme.d.ts +113 -2
- package/dist/utils/themes/theme.d.ts.map +1 -1
- package/dist/utils/themes/theme.js.map +1 -1
- package/package.json +1 -1
- package/dist/chart_types/goal_chart/layout/types/config_types.d.ts +0 -22
- package/dist/chart_types/goal_chart/layout/types/config_types.d.ts.map +0 -1
- package/dist/chart_types/goal_chart/layout/types/config_types.js +0 -3
- package/dist/chart_types/goal_chart/layout/types/config_types.js.map +0 -1
- package/dist/chart_types/heatmap/layout/config/config.d.ts +0 -2
- package/dist/chart_types/heatmap/layout/config/config.d.ts.map +0 -1
- package/dist/chart_types/heatmap/layout/config/config.js +0 -92
- package/dist/chart_types/heatmap/layout/config/config.js.map +0 -1
- package/dist/chart_types/heatmap/layout/types/config_types.d.ts +0 -101
- package/dist/chart_types/heatmap/layout/types/config_types.d.ts.map +0 -1
- package/dist/chart_types/heatmap/layout/types/config_types.js.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/get_grid_full_height.d.ts +0 -2
- package/dist/chart_types/heatmap/state/selectors/get_grid_full_height.d.ts.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/get_grid_full_height.js +0 -53
- package/dist/chart_types/heatmap/state/selectors/get_grid_full_height.js.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.d.ts +0 -2
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.d.ts.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.js +0 -9
- package/dist/chart_types/heatmap/state/selectors/get_heatmap_config.js.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/scenegraph.d.ts.map +0 -1
- package/dist/chart_types/heatmap/state/selectors/scenegraph.js +0 -33
- package/dist/chart_types/heatmap/state/selectors/scenegraph.js.map +0 -1
- package/dist/chart_types/wordcloud/layout/config/config.d.ts +0 -2
- package/dist/chart_types/wordcloud/layout/config/config.d.ts.map +0 -1
- package/dist/chart_types/wordcloud/layout/config/config.js +0 -27
- package/dist/chart_types/wordcloud/layout/config/config.js.map +0 -1
- package/dist/chart_types/wordcloud/layout/types/config_types.d.ts +0 -17
- package/dist/chart_types/wordcloud/layout/types/config_types.d.ts.map +0 -1
- package/dist/chart_types/wordcloud/layout/types/config_types.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/primitives/path.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/primitives/path.ts"],"names":[],"mappings":";;;AAQA,uFAAiF;AAEjF,0DAAiE;AAGjE,+BAAyC;AAGzC,SAAgB,eAAe,CAC7B,GAA6B,EAC7B,SAAgB,EAChB,SAAwB,EACxB,MAAc,EACd,SAAiB,EACjB,aAA4B,EAC5B,SAAe,EACf,UAAmB;IAEnB,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE;QACnD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QACxC,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,EAAE;QAC1C,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE;YAClD,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;YACxC,IAAA,sBAAe,EAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AApBD,0CAoBC;AAGD,SAAgB,cAAc,CAC5B,GAA6B,EAC7B,SAAgB,EAChB,IAAY,EACZ,IAAU,EACV,OAAa,EACb,aAA4B,EAC5B,SAAe,EACf,UAAmB;IAEnB,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,KAAK,EAAE,cAAM,OAAA,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,EAA1C,CAA0C,CAAC,CAAC;IACvG,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,EAAE;QAC1C,IAAA,uBAAc,EAAC,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,cAAM,OAAA,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAA7C,CAA6C,CAAC,CAAC;KAC1G;AACH,CAAC;AAdD,wCAcC;AAED,SAAS,cAAc,CAAC,GAA6B,EAAE,IAAY,EAAE,IAAU,EAAE,EAAe;QAAb,CAAC,OAAA,EAAE,CAAC,OAAA;IACrF,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpB,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,GAAG,CAAC,SAAS,GAAG,IAAA,0CAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjB,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAClB;AACH,CAAC"}
|
|
@@ -1,35 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
-
if (!m) return o;
|
|
16
|
-
var i = m.call(o), r, ar = [], e;
|
|
17
|
-
try {
|
|
18
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
-
}
|
|
20
|
-
catch (error) { e = { error: error }; }
|
|
21
|
-
finally {
|
|
22
|
-
try {
|
|
23
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
-
}
|
|
25
|
-
finally { if (e) throw e.error; }
|
|
26
|
-
}
|
|
27
|
-
return ar;
|
|
28
|
-
};
|
|
29
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
3
|
exports.wrapLines = exports.renderText = void 0;
|
|
31
4
|
var text_utils_1 = require("../../../../../common/text_utils");
|
|
32
5
|
var canvas_1 = require("../../../../../renderers/canvas");
|
|
6
|
+
var canvas_text_bbox_calculator_1 = require("../../../../../utils/bbox/canvas_text_bbox_calculator");
|
|
33
7
|
var common_1 = require("../../../../../utils/common");
|
|
34
8
|
function renderText(ctx, origin, text, font, angle, translateX, translateY, scale, direction) {
|
|
35
9
|
if (angle === void 0) { angle = 0; }
|
|
@@ -74,16 +48,9 @@ function wrapLines(ctx, text, font, fontSize, fixedWidth, fixedHeight, _a) {
|
|
|
74
48
|
var currentHeightPx = 0;
|
|
75
49
|
var shouldWrap = true;
|
|
76
50
|
var textArr = [];
|
|
77
|
-
var textMeasureProcessor = (0,
|
|
51
|
+
var textMeasureProcessor = (0, canvas_text_bbox_calculator_1.measureText)(ctx);
|
|
78
52
|
var getTextWidth = function (textString) {
|
|
79
|
-
|
|
80
|
-
__assign({ text: textString }, font),
|
|
81
|
-
]);
|
|
82
|
-
var _a = __read(measuredText, 1), measure = _a[0];
|
|
83
|
-
if (measure) {
|
|
84
|
-
return measure.width;
|
|
85
|
-
}
|
|
86
|
-
return 0;
|
|
53
|
+
return textMeasureProcessor(textString, font, fontSize).width;
|
|
87
54
|
};
|
|
88
55
|
var additionalWidth = shouldAddEllipsis ? getTextWidth(ELLIPSIS) : 0;
|
|
89
56
|
for (var i = 0, max = lines.length; i < max; ++i) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/primitives/text.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/primitives/text.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ function renderXYChartCanvas2d(ctx, dpr, clippings, props) {
|
|
|
16
16
|
var imgCanvas = document.createElement('canvas');
|
|
17
17
|
(0, canvas_1.withContext)(ctx, function () {
|
|
18
18
|
ctx.scale(dpr, dpr);
|
|
19
|
-
var renderingArea = props.renderingArea, chartTransform = props.chartTransform, rotation = props.rotation, geometries = props.geometries, geometriesIndex = props.geometriesIndex, _a = props.theme, sharedAxesStyle = _a.axes, sharedStyle = _a.sharedStyle, barSeriesStyle = _a.barSeriesStyle, highlightedLegendItem = props.highlightedLegendItem, annotationDimensions = props.annotationDimensions, annotationSpecs = props.annotationSpecs, perPanelAxisGeoms = props.perPanelAxisGeoms, perPanelGridLines = props.perPanelGridLines, axesSpecs = props.axesSpecs, axesStyles = props.axesStyles, debug = props.debug, panelGeoms = props.panelGeoms;
|
|
19
|
+
var renderingArea = props.renderingArea, chartTransform = props.chartTransform, rotation = props.rotation, geometries = props.geometries, geometriesIndex = props.geometriesIndex, _a = props.theme, sharedAxesStyle = _a.axes, sharedStyle = _a.sharedStyle, barSeriesStyle = _a.barSeriesStyle, background = _a.background, highlightedLegendItem = props.highlightedLegendItem, annotationDimensions = props.annotationDimensions, annotationSpecs = props.annotationSpecs, perPanelAxisGeoms = props.perPanelAxisGeoms, perPanelGridLines = props.perPanelGridLines, axesSpecs = props.axesSpecs, axesStyles = props.axesStyles, debug = props.debug, panelGeoms = props.panelGeoms;
|
|
20
20
|
var transform = { x: renderingArea.left + chartTransform.x, y: renderingArea.top + chartTransform.y };
|
|
21
21
|
(0, canvas_1.renderLayers)(ctx, [
|
|
22
22
|
function () { return (0, canvas_1.clearCanvas)(ctx, 'transparent'); },
|
|
@@ -84,6 +84,7 @@ function renderXYChartCanvas2d(ctx, dpr, clippings, props) {
|
|
|
84
84
|
rotation: rotation,
|
|
85
85
|
debug: debug,
|
|
86
86
|
barSeriesStyle: barSeriesStyle,
|
|
87
|
+
background: background,
|
|
87
88
|
});
|
|
88
89
|
});
|
|
89
90
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":";;;AAQA,oDAAmD;AAEnD,uDAAwG;AACxG,6CAAkD;AAClD,iCAAsC;AACtC,+BAAoC;AACpC,qCAA0C;AAC1C,iCAAsC;AACtC,iCAAsC;AACtC,0CAA0E;AAC1E,uCAAgD;AAChD,oCAA+C;AAI/C,SAAgB,qBAAqB,CACnC,GAA6B,EAC7B,GAAW,EACX,SAAe,EACf,KAA8B;IAE9B,IAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEnD,IAAA,oBAAW,EAAC,GAAG,EAAE;QAEf,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAElB,IAAA,aAAa,GAeX,KAAK,cAfM,EACb,cAAc,GAcZ,KAAK,eAdO,EACd,QAAQ,GAaN,KAAK,SAbC,EACR,UAAU,GAYR,KAAK,WAZG,EACV,eAAe,GAWb,KAAK,gBAXQ,EACf,KAUE,KAAK,
|
|
1
|
+
{"version":3,"file":"renderers.js","sourceRoot":"","sources":["../../../../../src/chart_types/xy_chart/renderer/canvas/renderers.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ var CHART_DIRECTION = {
|
|
|
26
26
|
RightToLeft: -90,
|
|
27
27
|
};
|
|
28
28
|
function renderBarValues(ctx, props) {
|
|
29
|
-
var bars = props.bars, debug = props.debug, rotation = props.rotation, renderingArea = props.renderingArea, barSeriesStyle = props.barSeriesStyle, panel = props.panel;
|
|
29
|
+
var bars = props.bars, debug = props.debug, rotation = props.rotation, renderingArea = props.renderingArea, barSeriesStyle = props.barSeriesStyle, panel = props.panel, background = props.background;
|
|
30
30
|
var _a = barSeriesStyle.displayValue, fontFamily = _a.fontFamily, fontStyle = _a.fontStyle, fill = _a.fill, alignment = _a.alignment;
|
|
31
31
|
bars.forEach(function (bar) {
|
|
32
32
|
if (!bar.displayValue) {
|
|
@@ -34,7 +34,7 @@ function renderBarValues(ctx, props) {
|
|
|
34
34
|
}
|
|
35
35
|
var _a = bar.displayValue, text = _a.text, fontSize = _a.fontSize, fontScale = _a.fontScale, overflowConstraints = _a.overflowConstraints, isValueContainedInElement = _a.isValueContainedInElement;
|
|
36
36
|
var shadowSize = getTextBorderSize(fill);
|
|
37
|
-
var _b = getTextColors(fill, bar.color), fillColor = _b.fillColor, shadowColor = _b.shadowColor;
|
|
37
|
+
var _b = getTextColors(fill, bar.color, background), fillColor = _b.fillColor, shadowColor = _b.shadowColor;
|
|
38
38
|
var font = {
|
|
39
39
|
fontFamily: fontFamily,
|
|
40
40
|
fontStyle: fontStyle !== null && fontStyle !== void 0 ? fontStyle : 'normal',
|
|
@@ -149,7 +149,8 @@ function isOverflow(rect, chartDimensions, chartRotation) {
|
|
|
149
149
|
var cHeight = vertical ? chartDimensions.width : chartDimensions.height;
|
|
150
150
|
return rect.x < 0 || rect.x + rect.width > cWidth || rect.y < 0 || rect.y + rect.height > cHeight;
|
|
151
151
|
}
|
|
152
|
-
function getTextColors(fillDefinition, geometryColor) {
|
|
152
|
+
function getTextColors(fillDefinition, geometryColor, _a) {
|
|
153
|
+
var backgroundColor = _a.color, fallbackBGColor = _a.fallbackColor;
|
|
153
154
|
if (typeof fillDefinition === 'string') {
|
|
154
155
|
return { fillColor: fillDefinition, shadowColor: colors_1.Colors.Transparent.keyword };
|
|
155
156
|
}
|
|
@@ -159,8 +160,8 @@ function getTextColors(fillDefinition, geometryColor) {
|
|
|
159
160
|
shadowColor: fillDefinition.borderColor || colors_1.Colors.Transparent.keyword,
|
|
160
161
|
};
|
|
161
162
|
}
|
|
162
|
-
var fillColor = (0, fill_text_color_1.fillTextColor)(geometryColor);
|
|
163
|
-
var shadowColor = (0, fill_text_color_1.fillTextColor)(fillColor);
|
|
163
|
+
var fillColor = (0, fill_text_color_1.fillTextColor)(fallbackBGColor, geometryColor, backgroundColor);
|
|
164
|
+
var shadowColor = (0, fill_text_color_1.fillTextColor)(fallbackBGColor, fillColor, backgroundColor);
|
|
164
165
|
return {
|
|
165
166
|
fillColor: fillColor,
|
|
166
167
|
shadowColor: shadowColor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/values/bar.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAQA,uDAAsD;AACtD,yEAAsE;AAGtE,sDAA+F;AAI/F,8CAA+D;AAC/D,2CAA2D;AAC3D,wCAAiD;AACjD,4DAA8D;
|
|
1
|
+
{"version":3,"file":"bar.js","sourceRoot":"","sources":["../../../../../../src/chart_types/xy_chart/renderer/canvas/values/bar.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,7 @@ var d3_shape_1 = require("d3-shape");
|
|
|
5
5
|
var curves_1 = require("../../../utils/curves");
|
|
6
6
|
var points_1 = require("./points");
|
|
7
7
|
var utils_1 = require("./utils");
|
|
8
|
-
function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBandedSpec, xScaleOffset,
|
|
9
|
-
if (isStacked === void 0) { isStacked = false; }
|
|
8
|
+
function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBandedSpec, xScaleOffset, style, markSizeOptions, isStacked, hasFit, pointStyleAccessor) {
|
|
10
9
|
var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
11
10
|
var y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
|
|
12
11
|
var definedFn = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|
|
@@ -32,7 +31,7 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBa
|
|
|
32
31
|
lines.push(y1Line);
|
|
33
32
|
if (y0Line)
|
|
34
33
|
lines.push(y0Line);
|
|
35
|
-
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color,
|
|
34
|
+
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, style.point, isBandedSpec, markSizeOptions, false, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
36
35
|
var areaGeometry = {
|
|
37
36
|
area: pathGenerator(dataSeries.data) || '',
|
|
38
37
|
lines: lines,
|
|
@@ -51,12 +50,10 @@ function renderArea(shift, dataSeries, xScale, yScale, panel, color, curve, isBa
|
|
|
51
50
|
smHorizontalAccessorValue: dataSeries.smHorizontalAccessorValue,
|
|
52
51
|
smVerticalAccessorValue: dataSeries.smVerticalAccessorValue,
|
|
53
52
|
},
|
|
54
|
-
|
|
55
|
-
seriesAreaLineStyle: seriesStyle.line,
|
|
56
|
-
seriesPointStyle: seriesStyle.point,
|
|
53
|
+
style: style,
|
|
57
54
|
isStacked: isStacked,
|
|
58
55
|
clippedRanges: clippedRanges,
|
|
59
|
-
|
|
56
|
+
shouldClip: hasFit,
|
|
60
57
|
};
|
|
61
58
|
return {
|
|
62
59
|
areaGeometry: areaGeometry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAOiB;AAGjB,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,YAAqB,EACrB,YAAoB,EACpB,
|
|
1
|
+
{"version":3,"file":"area.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/area.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.getBarStyleOverrides = exports.renderBars = void 0;
|
|
15
15
|
var constants_1 = require("../../../scales/constants");
|
|
16
|
-
var canvas_text_bbox_calculator_1 = require("../../../utils/bbox/canvas_text_bbox_calculator");
|
|
17
16
|
var common_1 = require("../../../utils/common");
|
|
18
17
|
var geometry_1 = require("../../../utils/geometry");
|
|
19
18
|
var indexed_geometry_map_1 = require("../utils/indexed_geometry_map");
|
|
@@ -21,100 +20,98 @@ var specs_1 = require("../utils/specs");
|
|
|
21
20
|
var points_1 = require("./points");
|
|
22
21
|
var PADDING = 1;
|
|
23
22
|
var FONT_SIZE_FACTOR = 0.7;
|
|
24
|
-
function renderBars(orderIndex, dataSeries, xScale, yScale, panel, chartRotation, minBarHeight, color, sharedSeriesStyle, displayValueSettings, styleAccessor, stackMode) {
|
|
23
|
+
function renderBars(measureText, orderIndex, dataSeries, xScale, yScale, panel, chartRotation, minBarHeight, color, sharedSeriesStyle, displayValueSettings, styleAccessor, stackMode) {
|
|
25
24
|
var _a = sharedSeriesStyle.displayValue, fontSize = _a.fontSize, fontFamily = _a.fontFamily;
|
|
26
25
|
var initialBarTuple = { barGeometries: [], indexedGeometryMap: new indexed_geometry_map_1.IndexedGeometryMap() };
|
|
27
26
|
var isLogY = yScale.type === constants_1.ScaleType.Log;
|
|
28
27
|
var isInvertedY = yScale.isInverted;
|
|
29
|
-
return
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (!xScale.isValueInDomain(datum.x) || Number.isNaN(xScaled)) {
|
|
34
|
-
return barTuple;
|
|
35
|
-
}
|
|
36
|
-
var barGeometries = barTuple.barGeometries, indexedGeometryMap = barTuple.indexedGeometryMap;
|
|
37
|
-
var y0 = datum.y0, y1 = datum.y1, initialY1 = datum.initialY1, filled = datum.filled;
|
|
38
|
-
var rawY = isLogY && (y1 === 0 || y1 === null) ? yScale.range[0] : yScale.scale(y1);
|
|
39
|
-
var y0Scaled = isLogY
|
|
40
|
-
? y0 === 0 || y0 === null
|
|
41
|
-
? yScale.range[isInvertedY ? 1 : 0]
|
|
42
|
-
: yScale.scale(y0)
|
|
43
|
-
: yScale.scale(y0 === null ? 0 : y0);
|
|
44
|
-
var finiteHeight = y0Scaled - rawY || 0;
|
|
45
|
-
var absHeight = Math.abs(finiteHeight);
|
|
46
|
-
var height = absHeight === 0 ? absHeight : Math.max(minBarHeight, absHeight);
|
|
47
|
-
var heightExtension = height - absHeight;
|
|
48
|
-
var isUpsideDown = finiteHeight < 0;
|
|
49
|
-
var finiteY = Number.isNaN(y0Scaled + rawY) ? 0 : rawY;
|
|
50
|
-
var y = isUpsideDown ? finiteY - height + heightExtension : finiteY - heightExtension;
|
|
51
|
-
var seriesIdentifier = {
|
|
52
|
-
key: dataSeries.key,
|
|
53
|
-
specId: dataSeries.specId,
|
|
54
|
-
yAccessor: dataSeries.yAccessor,
|
|
55
|
-
splitAccessors: dataSeries.splitAccessors,
|
|
56
|
-
seriesKeys: dataSeries.seriesKeys,
|
|
57
|
-
smHorizontalAccessorValue: dataSeries.smHorizontalAccessorValue,
|
|
58
|
-
smVerticalAccessorValue: dataSeries.smVerticalAccessorValue,
|
|
59
|
-
};
|
|
60
|
-
var seriesStyle = getBarStyleOverrides(datum, seriesIdentifier, sharedSeriesStyle, styleAccessor);
|
|
61
|
-
var maxPixelWidth = (0, common_1.clamp)((_a = seriesStyle.rect.widthRatio) !== null && _a !== void 0 ? _a : 1, 0, 1) * xScale.bandwidth;
|
|
62
|
-
var minPixelWidth = (0, common_1.clamp)((_b = seriesStyle.rect.widthPixel) !== null && _b !== void 0 ? _b : 0, 0, maxPixelWidth);
|
|
63
|
-
var width = (0, common_1.clamp)((_c = seriesStyle.rect.widthPixel) !== null && _c !== void 0 ? _c : xScale.bandwidth, minPixelWidth, maxPixelWidth);
|
|
64
|
-
var x = xScaled + xScale.bandwidth * orderIndex + xScale.bandwidth / 2 - width / 2;
|
|
65
|
-
var y1Value = (0, points_1.getDatumYValue)(datum, false, false, stackMode);
|
|
66
|
-
var formattedDisplayValue = (_d = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.valueFormatter) === null || _d === void 0 ? void 0 : _d.call(displayValueSettings, y1Value);
|
|
67
|
-
var displayValueText = (displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.isAlternatingValueLabel) && barGeometries.length % 2 ? undefined : formattedDisplayValue;
|
|
68
|
-
var _g = computeBoxWidth(displayValueText !== null && displayValueText !== void 0 ? displayValueText : '', { padding: PADDING, fontSize: fontSize, fontFamily: fontFamily, textMeasure: textMeasure, width: width }, displayValueSettings), displayValueWidth = _g.displayValueWidth, fixedFontScale = _g.fixedFontScale;
|
|
69
|
-
var isHorizontalRotation = chartRotation % 180 === 0;
|
|
70
|
-
var referenceWidth = Math.max(isHorizontalRotation ? displayValueWidth : fixedFontScale, 1);
|
|
71
|
-
var textScalingFactor = getFinalFontScalingFactor((width * FONT_SIZE_FACTOR) / referenceWidth, fixedFontScale, fontSize);
|
|
72
|
-
var overflowConstraints = new Set((_e = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.overflowConstraints) !== null && _e !== void 0 ? _e : [
|
|
73
|
-
specs_1.LabelOverflowConstraint.ChartEdges,
|
|
74
|
-
specs_1.LabelOverflowConstraint.BarGeometry,
|
|
75
|
-
]);
|
|
76
|
-
var bboxWidthFactor = isHorizontalRotation ? textScalingFactor : 1;
|
|
77
|
-
var displayValue = displayValueText && (displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.showValueLabel)
|
|
78
|
-
? {
|
|
79
|
-
fontScale: textScalingFactor,
|
|
80
|
-
fontSize: fixedFontScale,
|
|
81
|
-
text: displayValueText,
|
|
82
|
-
width: bboxWidthFactor * displayValueWidth,
|
|
83
|
-
height: textScalingFactor * fixedFontScale,
|
|
84
|
-
overflowConstraints: overflowConstraints,
|
|
85
|
-
isValueContainedInElement: (_f = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.isValueContainedInElement) !== null && _f !== void 0 ? _f : false,
|
|
86
|
-
}
|
|
87
|
-
: undefined;
|
|
88
|
-
var barGeometry = {
|
|
89
|
-
displayValue: displayValue,
|
|
90
|
-
x: x,
|
|
91
|
-
y: y,
|
|
92
|
-
transform: { x: 0, y: 0 },
|
|
93
|
-
width: width,
|
|
94
|
-
height: height,
|
|
95
|
-
color: color,
|
|
96
|
-
value: { x: datum.x, y: y1Value, mark: null, accessor: geometry_1.BandedAccessorType.Y1, datum: datum.datum },
|
|
97
|
-
seriesIdentifier: seriesIdentifier,
|
|
98
|
-
seriesStyle: seriesStyle,
|
|
99
|
-
panel: panel,
|
|
100
|
-
};
|
|
101
|
-
indexedGeometryMap.set(barGeometry);
|
|
102
|
-
if (y1 !== null && initialY1 !== null && (filled === null || filled === void 0 ? void 0 : filled.y1) === undefined) {
|
|
103
|
-
barGeometries.push(barGeometry);
|
|
104
|
-
}
|
|
28
|
+
return dataSeries.data.reduce(function (barTuple, datum) {
|
|
29
|
+
var _a, _b, _c, _d, _e, _f;
|
|
30
|
+
var xScaled = xScale.scale(datum.x);
|
|
31
|
+
if (!xScale.isValueInDomain(datum.x) || Number.isNaN(xScaled)) {
|
|
105
32
|
return barTuple;
|
|
106
|
-
}
|
|
107
|
-
|
|
33
|
+
}
|
|
34
|
+
var barGeometries = barTuple.barGeometries, indexedGeometryMap = barTuple.indexedGeometryMap;
|
|
35
|
+
var y0 = datum.y0, y1 = datum.y1, initialY1 = datum.initialY1, filled = datum.filled;
|
|
36
|
+
var rawY = isLogY && (y1 === 0 || y1 === null) ? yScale.range[0] : yScale.scale(y1);
|
|
37
|
+
var y0Scaled = isLogY
|
|
38
|
+
? y0 === 0 || y0 === null
|
|
39
|
+
? yScale.range[isInvertedY ? 1 : 0]
|
|
40
|
+
: yScale.scale(y0)
|
|
41
|
+
: yScale.scale(y0 === null ? 0 : y0);
|
|
42
|
+
var finiteHeight = y0Scaled - rawY || 0;
|
|
43
|
+
var absHeight = Math.abs(finiteHeight);
|
|
44
|
+
var height = absHeight === 0 ? absHeight : Math.max(minBarHeight, absHeight);
|
|
45
|
+
var heightExtension = height - absHeight;
|
|
46
|
+
var isUpsideDown = finiteHeight < 0;
|
|
47
|
+
var finiteY = Number.isNaN(y0Scaled + rawY) ? 0 : rawY;
|
|
48
|
+
var y = isUpsideDown ? finiteY - height + heightExtension : finiteY - heightExtension;
|
|
49
|
+
var seriesIdentifier = {
|
|
50
|
+
key: dataSeries.key,
|
|
51
|
+
specId: dataSeries.specId,
|
|
52
|
+
yAccessor: dataSeries.yAccessor,
|
|
53
|
+
splitAccessors: dataSeries.splitAccessors,
|
|
54
|
+
seriesKeys: dataSeries.seriesKeys,
|
|
55
|
+
smHorizontalAccessorValue: dataSeries.smHorizontalAccessorValue,
|
|
56
|
+
smVerticalAccessorValue: dataSeries.smVerticalAccessorValue,
|
|
57
|
+
};
|
|
58
|
+
var seriesStyle = getBarStyleOverrides(datum, seriesIdentifier, sharedSeriesStyle, styleAccessor);
|
|
59
|
+
var maxPixelWidth = (0, common_1.clamp)((_a = seriesStyle.rect.widthRatio) !== null && _a !== void 0 ? _a : 1, 0, 1) * xScale.bandwidth;
|
|
60
|
+
var minPixelWidth = (0, common_1.clamp)((_b = seriesStyle.rect.widthPixel) !== null && _b !== void 0 ? _b : 0, 0, maxPixelWidth);
|
|
61
|
+
var width = (0, common_1.clamp)((_c = seriesStyle.rect.widthPixel) !== null && _c !== void 0 ? _c : xScale.bandwidth, minPixelWidth, maxPixelWidth);
|
|
62
|
+
var x = xScaled + xScale.bandwidth * orderIndex + xScale.bandwidth / 2 - width / 2;
|
|
63
|
+
var y1Value = (0, points_1.getDatumYValue)(datum, false, false, stackMode);
|
|
64
|
+
var formattedDisplayValue = (_d = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.valueFormatter) === null || _d === void 0 ? void 0 : _d.call(displayValueSettings, y1Value);
|
|
65
|
+
var displayValueText = (displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.isAlternatingValueLabel) && barGeometries.length % 2 ? undefined : formattedDisplayValue;
|
|
66
|
+
var _g = computeBoxWidth(displayValueText !== null && displayValueText !== void 0 ? displayValueText : '', { padding: PADDING, fontSize: fontSize, fontFamily: fontFamily, measureText: measureText, width: width }, displayValueSettings), displayValueWidth = _g.displayValueWidth, fixedFontScale = _g.fixedFontScale;
|
|
67
|
+
var isHorizontalRotation = chartRotation % 180 === 0;
|
|
68
|
+
var referenceWidth = Math.max(isHorizontalRotation ? displayValueWidth : fixedFontScale, 1);
|
|
69
|
+
var textScalingFactor = getFinalFontScalingFactor((width * FONT_SIZE_FACTOR) / referenceWidth, fixedFontScale, fontSize);
|
|
70
|
+
var overflowConstraints = new Set((_e = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.overflowConstraints) !== null && _e !== void 0 ? _e : [
|
|
71
|
+
specs_1.LabelOverflowConstraint.ChartEdges,
|
|
72
|
+
specs_1.LabelOverflowConstraint.BarGeometry,
|
|
73
|
+
]);
|
|
74
|
+
var bboxWidthFactor = isHorizontalRotation ? textScalingFactor : 1;
|
|
75
|
+
var displayValue = displayValueText && (displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.showValueLabel)
|
|
76
|
+
? {
|
|
77
|
+
fontScale: textScalingFactor,
|
|
78
|
+
fontSize: fixedFontScale,
|
|
79
|
+
text: displayValueText,
|
|
80
|
+
width: bboxWidthFactor * displayValueWidth,
|
|
81
|
+
height: textScalingFactor * fixedFontScale,
|
|
82
|
+
overflowConstraints: overflowConstraints,
|
|
83
|
+
isValueContainedInElement: (_f = displayValueSettings === null || displayValueSettings === void 0 ? void 0 : displayValueSettings.isValueContainedInElement) !== null && _f !== void 0 ? _f : false,
|
|
84
|
+
}
|
|
85
|
+
: undefined;
|
|
86
|
+
var barGeometry = {
|
|
87
|
+
displayValue: displayValue,
|
|
88
|
+
x: x,
|
|
89
|
+
y: y,
|
|
90
|
+
transform: { x: 0, y: 0 },
|
|
91
|
+
width: width,
|
|
92
|
+
height: height,
|
|
93
|
+
color: color,
|
|
94
|
+
value: { x: datum.x, y: y1Value, mark: null, accessor: geometry_1.BandedAccessorType.Y1, datum: datum.datum },
|
|
95
|
+
seriesIdentifier: seriesIdentifier,
|
|
96
|
+
seriesStyle: seriesStyle,
|
|
97
|
+
panel: panel,
|
|
98
|
+
};
|
|
99
|
+
indexedGeometryMap.set(barGeometry);
|
|
100
|
+
if (y1 !== null && initialY1 !== null && (filled === null || filled === void 0 ? void 0 : filled.y1) === undefined) {
|
|
101
|
+
barGeometries.push(barGeometry);
|
|
102
|
+
}
|
|
103
|
+
return barTuple;
|
|
104
|
+
}, initialBarTuple);
|
|
108
105
|
}
|
|
109
106
|
exports.renderBars = renderBars;
|
|
110
107
|
function computeBoxWidth(text, _a, displayValueSettings) {
|
|
111
|
-
var padding = _a.padding, fontSize = _a.fontSize, fontFamily = _a.fontFamily,
|
|
108
|
+
var padding = _a.padding, fontSize = _a.fontSize, fontFamily = _a.fontFamily, measureText = _a.measureText, width = _a.width;
|
|
112
109
|
var fixedFontScale = Math.max(typeof fontSize === 'number' ? fontSize : fontSize.min, 1);
|
|
113
|
-
var computedDisplayValueWidth =
|
|
110
|
+
var computedDisplayValueWidth = measureText(text, { fontFamily: fontFamily, fontWeight: 'normal', fontStyle: 'normal', fontVariant: 'normal' }, fixedFontScale).width;
|
|
114
111
|
if (typeof fontSize !== 'number') {
|
|
115
112
|
return {
|
|
116
113
|
fixedFontScale: fixedFontScale,
|
|
117
|
-
displayValueWidth: computedDisplayValueWidth,
|
|
114
|
+
displayValueWidth: computedDisplayValueWidth + padding,
|
|
118
115
|
};
|
|
119
116
|
}
|
|
120
117
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bars.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bars.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,uDAAsD;
|
|
1
|
+
{"version":3,"file":"bars.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bars.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.renderBubble = void 0;
|
|
4
4
|
var points_1 = require("./points");
|
|
5
5
|
function renderBubble(shift, dataSeries, xScale, yScale, color, panel, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, isMixedChart, pointStyleAccessor) {
|
|
6
|
-
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions,
|
|
6
|
+
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, !isMixedChart, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
7
7
|
var bubbleGeometry = {
|
|
8
8
|
points: pointGeometries,
|
|
9
9
|
color: color,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bubble.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bubble.ts"],"names":[],"mappings":";;;AAgBA,mCAAwC;AAIxC,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAY,EACZ,KAAiB,EACjB,cAAuB,EACvB,YAAoB,EACpB,WAA8B,EAC9B,eAAgC,EAChC,YAAqB,EACrB,kBAAuC;IAKjC,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"bubble.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/bubble.ts"],"names":[],"mappings":";;;AAgBA,mCAAwC;AAIxC,SAAgB,YAAY,CAC1B,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAY,EACZ,KAAiB,EACjB,cAAuB,EACvB,YAAoB,EACpB,WAA8B,EAC9B,eAAgC,EAChC,YAAqB,EACrB,kBAAuC;IAKjC,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,CAAC,YAAY,EACb,kBAAkB,CACnB,EAZO,eAAe,qBAAA,EAAE,kBAAkB,wBAY1C,CAAC;IAEF,IAAM,cAAc,GAAG;QACrB,MAAM,EAAE,eAAe;QACvB,KAAK,OAAA;QACL,gBAAgB,EAAE;YAChB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;YAC/D,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;SAC5D;QACD,gBAAgB,EAAE,WAAW,CAAC,KAAK;KACpC,CAAC;IACF,OAAO;QACL,cAAc,gBAAA;QACd,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AAjDD,oCAiDC"}
|
|
@@ -5,7 +5,7 @@ var d3_shape_1 = require("d3-shape");
|
|
|
5
5
|
var curves_1 = require("../../../utils/curves");
|
|
6
6
|
var points_1 = require("./points");
|
|
7
7
|
var utils_1 = require("./utils");
|
|
8
|
-
function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions,
|
|
8
|
+
function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY0Accessors, xScaleOffset, seriesStyle, markSizeOptions, hasFit, pointStyleAccessor) {
|
|
9
9
|
var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
10
10
|
var definedFn = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|
|
11
11
|
var y1Accessor = (0, utils_1.getYDatumValueFn)();
|
|
@@ -17,7 +17,7 @@ function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
17
17
|
.y(y1Fn)
|
|
18
18
|
.defined(function (datum) { return definedFn(datum, y1Accessor); })
|
|
19
19
|
.curve((0, curves_1.getCurveFactory)(curve));
|
|
20
|
-
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
20
|
+
var _a = (0, points_1.renderPoints)(shift - xScaleOffset, dataSeries, xScale, yScale, panel, color, seriesStyle.point, hasY0Accessors, markSizeOptions, false, pointStyleAccessor), pointGeometries = _a.pointGeometries, indexedGeometryMap = _a.indexedGeometryMap;
|
|
21
21
|
var clippedRanges = (0, utils_1.getClippedRanges)(dataSeries.data, xScale, xScaleOffset);
|
|
22
22
|
var lineGeometry = {
|
|
23
23
|
line: pathGenerator(dataSeries.data) || '',
|
|
@@ -36,10 +36,9 @@ function renderLine(shift, dataSeries, xScale, yScale, panel, color, curve, hasY
|
|
|
36
36
|
smHorizontalAccessorValue: dataSeries.smHorizontalAccessorValue,
|
|
37
37
|
smVerticalAccessorValue: dataSeries.smVerticalAccessorValue,
|
|
38
38
|
},
|
|
39
|
-
|
|
40
|
-
seriesPointStyle: seriesStyle.point,
|
|
39
|
+
style: seriesStyle,
|
|
41
40
|
clippedRanges: clippedRanges,
|
|
42
|
-
|
|
41
|
+
shouldClip: hasFit,
|
|
43
42
|
};
|
|
44
43
|
return {
|
|
45
44
|
lineGeometry: lineGeometry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/line.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAAqH;AAGrH,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,cAAuB,EACvB,YAAoB,EACpB,WAA4B,EAC5B,eAAgC,EAChC,
|
|
1
|
+
{"version":3,"file":"line.js","sourceRoot":"","sources":["../../../../src/chart_types/xy_chart/rendering/line.ts"],"names":[],"mappings":";;;AAQA,qCAAgC;AAIhC,gDAAmE;AAOnE,mCAAwC;AACxC,iCAAqH;AAGrH,SAAgB,UAAU,CACxB,KAAa,EACb,UAAsB,EACtB,MAA8B,EAC9B,MAAqB,EACrB,KAAiB,EACjB,KAAY,EACZ,KAAgB,EAChB,cAAuB,EACvB,YAAoB,EACpB,WAA4B,EAC5B,eAAgC,EAChC,MAAe,EACf,kBAAuC;IAKvC,IAAM,IAAI,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,CAAC;IACxC,IAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,IAAM,UAAU,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAEtC,IAAM,aAAa,GAAG,IAAA,eAAI,GAAmB;SAC1C,CAAC,CAAC,UAAC,EAAK;YAAH,CAAC,OAAA;QAAO,OAAA,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY;IAA9B,CAA8B,CAAC;SAC5C,CAAC,CAAC,IAAI,CAAC;SACP,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,SAAS,CAAC,KAAK,EAAE,UAAU,CAAC,EAA5B,CAA4B,CAAC;SAChD,KAAK,CAAC,IAAA,wBAAe,EAAC,KAAK,CAAC,CAAC,CAAC;IAE3B,IAAA,KAA0C,IAAA,qBAAY,EAC1D,KAAK,GAAG,YAAY,EACpB,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,CAAC,KAAK,EACjB,cAAc,EACd,eAAe,EACf,KAAK,EACL,kBAAkB,CACnB,EAZO,eAAe,qBAAA,EAAE,kBAAkB,wBAY1C,CAAC;IAGF,IAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAE9E,IAAM,YAAY,GAAG;QACnB,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE;QAC1C,MAAM,EAAE,eAAe;QACvB,KAAK,OAAA;QACL,SAAS,EAAE;YACT,CAAC,EAAE,KAAK;YACR,CAAC,EAAE,CAAC;SACL;QACD,gBAAgB,EAAE;YAChB,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;YAC/D,uBAAuB,EAAE,UAAU,CAAC,uBAAuB;SAC5D;QACD,KAAK,EAAE,WAAW;QAClB,aAAa,eAAA;QACb,UAAU,EAAE,MAAM;KACnB,CAAC;IACF,OAAO;QACL,YAAY,cAAA;QACZ,kBAAkB,oBAAA;KACnB,CAAC;AACJ,CAAC;AAtED,gCAsEC"}
|
|
@@ -32,13 +32,12 @@ var indexed_geometry_map_1 = require("../utils/indexed_geometry_map");
|
|
|
32
32
|
var specs_1 = require("../utils/specs");
|
|
33
33
|
var point_style_1 = require("./point_style");
|
|
34
34
|
var utils_1 = require("./utils");
|
|
35
|
-
function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyle, isBandChart, markSizeOptions,
|
|
36
|
-
if (spatial === void 0) { spatial = false; }
|
|
35
|
+
function renderPoints(shift, dataSeries, xScale, yScale, panel, color, pointStyle, isBandChart, markSizeOptions, useSpatialIndex, styleAccessor) {
|
|
37
36
|
var indexedGeometryMap = new indexed_geometry_map_1.IndexedGeometryMap();
|
|
38
37
|
var getRadius = markSizeOptions.enabled
|
|
39
38
|
? getRadiusFn(dataSeries.data, pointStyle.strokeWidth, markSizeOptions.ratio)
|
|
40
39
|
: function () { return 0; };
|
|
41
|
-
var geometryType =
|
|
40
|
+
var geometryType = useSpatialIndex ? indexed_geometry_map_1.GeometryType.spatial : indexed_geometry_map_1.GeometryType.linear;
|
|
42
41
|
var y1Fn = (0, utils_1.getY1ScaledValueFn)(yScale);
|
|
43
42
|
var y0Fn = (0, utils_1.getY0ScaledValueFn)(yScale);
|
|
44
43
|
var yDefined = (0, utils_1.isYValueDefinedFn)(yScale, xScale);
|