Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove default small multiples value #977

Merged
merged 14 commits into from
Jan 19, 2021
Merged

refactor: remove default small multiples value #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bfe3ba3
chore: export default sm type to know if sm is used
nickofthyme Jan 14, 2021
9a47ccd
refactor: remove default sm value with null
nickofthyme Jan 14, 2021
714e11a
docs: add click actions to sm stories
nickofthyme Jan 14, 2021
62e9a39
test: update broken tests with changes
nickofthyme Jan 14, 2021
09b95c5
chore: update api doc
nickofthyme Jan 14, 2021
f1c5fe4
Merge branch 'master' into export-sm-type
nickofthyme Jan 14, 2021
cf3d4cf
fix: null domain
nickofthyme Jan 15, 2021
fe46248
Merge branch 'master' into export-sm-type
nickofthyme Jan 15, 2021
cc7ba06
fix: remove null values for undefined
nickofthyme Jan 18, 2021
05eaef6
fix: remove null from sm type
nickofthyme Jan 18, 2021
3c175e1
fix: unneeded null default
nickofthyme Jan 19, 2021
ba8d5bc
Merge branch 'master' into export-sm-type
nickofthyme Jan 19, 2021
07ed367
test: fix jest snapshots
nickofthyme Jan 19, 2021
20a0c62
Merge branch 'master' into export-sm-type
nickofthyme Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions src/chart_types/xy_chart/rendering/rendering.areas.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ describe('Rendering points - areas', () => {
yAccessor: 1,
splitAccessors: new Map(),
seriesKeys: [1],
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
},
styleOverrides: undefined,
value: {
Expand Down Expand Up @@ -153,10 +150,7 @@ describe('Rendering points - areas', () => {
yAccessor: 1,
splitAccessors: new Map(),
seriesKeys: [1],
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
},
styleOverrides: undefined,
value: {
Expand Down Expand Up @@ -248,10 +242,7 @@ describe('Rendering points - areas', () => {
yAccessor: 1,
splitAccessors: new Map(),
seriesKeys: [1],
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
},
styleOverrides: undefined,
value: {
Expand Down Expand Up @@ -284,10 +275,7 @@ describe('Rendering points - areas', () => {
yAccessor: 1,
splitAccessors: new Map(),
seriesKeys: [1],
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
},
styleOverrides: undefined,
value: {
Expand Down Expand Up @@ -325,10 +313,7 @@ describe('Rendering points - areas', () => {
yAccessor: 1,
splitAccessors: new Map(),
seriesKeys: [1],
key:
'groupId{group_1}spec{spec_2}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
key: 'groupId{group_1}spec{spec_2}yAccessor{1}splitAccessors{}',
},
styleOverrides: undefined,
value: {
Expand Down Expand Up @@ -361,10 +346,7 @@ describe('Rendering points - areas', () => {
yAccessor: 1,
splitAccessors: new Map(),
seriesKeys: [1],
key:
'groupId{group_1}spec{spec_2}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
key: 'groupId{group_1}spec{spec_2}yAccessor{1}splitAccessors{}',
},
styleOverrides: undefined,
value: {
Expand Down
83 changes: 6 additions & 77 deletions src/chart_types/xy_chart/state/chart_state.interactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,58 +105,6 @@ function initStore(spec: BasicSeriesSpec) {
return store;
}

// const barStyle = {
// rect: {
// opacity: 1,
// },
// rectBorder: {
// strokeWidth: 1,
// visible: false,
// },
// displayValue: {
// fill: 'black',
// fontFamily: '',
// fontSize: 2,
// offsetX: 0,
// offsetY: 0,
// padding: 2,
// },
// };
// const indexedGeom1Red: BarGeometry = {
// color: 'red',
// x: 0,
// y: 0,
// width: 50,
// height: 100,
// value: {
// x: 0,
// y: 10,
// accessor: 'y1',
// },
// geometryId: {
// specId: SPEC_ID,
// seriesKey: [],
// },
// seriesStyle: barStyle,
// };
// const indexedGeom2Blue: BarGeometry = {
// color: 'blue',
// x: 50,
// y: 50,
// width: 50,
// height: 50,
// value: {
// x: 1,
// y: 5,
// accessor: 'y1',
// },
// geometryId: {
// specId: SPEC_ID,
// seriesKey: [],
// },
// seriesStyle: barStyle,
// };

describe('Chart state pointer interactions', () => {
let store: Store<GlobalChartState>;
const onElementOutCaller = createOnElementOutCaller();
Expand Down Expand Up @@ -421,14 +369,11 @@ function mouseOverTestSuite(scaleType: XScaleType) {
datum: [0, 10],
},
{
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
seriesKeys: [1],
specId: 'spec_1',
splitAccessors: new Map(),
yAccessor: 1,
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
},
],
]);
Expand Down Expand Up @@ -470,15 +415,11 @@ function mouseOverTestSuite(scaleType: XScaleType) {
datum: [0, 10],
},
{
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
seriesKeys: [1],
specId: 'spec_1',
splitAccessors: new Map(),
yAccessor: 1,

smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
},
],
]);
Expand Down Expand Up @@ -523,14 +464,11 @@ function mouseOverTestSuite(scaleType: XScaleType) {
datum: [0, 10],
},
{
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
seriesKeys: [1],
specId: 'spec_1',
splitAccessors: new Map(),
yAccessor: 1,
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
},
],
]);
Expand Down Expand Up @@ -580,14 +518,11 @@ function mouseOverTestSuite(scaleType: XScaleType) {
datum: [(spec.data[0] as Array<any>)[0], (spec.data[0] as Array<any>)[1]],
},
{
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
seriesKeys: [1],
specId: 'spec_1',
splitAccessors: new Map(),
yAccessor: 1,
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
},
],
]);
Expand Down Expand Up @@ -616,14 +551,11 @@ function mouseOverTestSuite(scaleType: XScaleType) {
datum: [(spec.data[1] as Array<any>)[0], (spec.data[1] as Array<any>)[1]],
},
{
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
seriesKeys: [1],
specId: 'spec_1',
splitAccessors: new Map(),
yAccessor: 1,
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
},
],
]);
Expand Down Expand Up @@ -716,14 +648,11 @@ function mouseOverTestSuite(scaleType: XScaleType) {
datum: [1, 5],
},
{
key:
'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}smV{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}smH{__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__}',
key: 'groupId{group_1}spec{spec_1}yAccessor{1}splitAccessors{}',
seriesKeys: [1],
specId: 'spec_1',
splitAccessors: new Map(),
yAccessor: 1,
smHorizontalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
smVerticalAccessorValue: '__ECH_DEFAULT_SINGLE_PANEL_SM_VALUE__',
},
],
]);
Expand Down
8 changes: 2 additions & 6 deletions src/chart_types/xy_chart/state/selectors/compute_small_multiple_scales.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ import createCachedSelector from 're-reselect';
import { ChartTypes } from '../../..';
import { ScaleBand } from '../../../../scales';
import { SpecTypes } from '../../../../specs/constants';
import {
DEFAULT_SINGLE_PANEL_SM_VALUE,
DEFAULT_SM_PANEL_PADDING,
SmallMultiplesSpec,
} from '../../../../specs/small_multiples';
import { DEFAULT_SM_PANEL_PADDING, SmallMultiplesSpec } from '../../../../specs/small_multiples';
import { GlobalChartState } from '../../../../state/chart_state';
import { getChartIdSelector } from '../../../../state/selectors/get_chart_id';
import { getSpecsFromStore } from '../../../../state/utils';
Expand Down Expand Up @@ -68,6 +64,6 @@ export const computeSmallMultipleScalesSelector = createCachedSelector(

function getScale(domain: Domain, maxRange: number, padding = DEFAULT_SM_PANEL_PADDING) {
const singlePanelSmallMultiple = domain.length <= 1;
const defaultDomain = domain.length === 0 ? [DEFAULT_SINGLE_PANEL_SM_VALUE] : domain;
const defaultDomain = domain.length === 0 ? [undefined] : domain;
return new ScaleBand(defaultDomain, [0, maxRange], undefined, singlePanelSmallMultiple ? 0 : padding);
}
5 changes: 2 additions & 3 deletions src/chart_types/xy_chart/state/selectors/get_cursor_band.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import createCachedSelector from 're-reselect';
import { Line, Rect } from '../../../../geoms/types';
import { Scale } from '../../../../scales';
import { SettingsSpec, PointerEvent } from '../../../../specs/settings';
import { DEFAULT_SINGLE_PANEL_SM_VALUE } from '../../../../specs/small_multiples';
import { GlobalChartState } from '../../../../state/chart_state';
import { getChartIdSelector } from '../../../../state/selectors/get_chart_id';
import { getSettingsSpecSelector } from '../../../../state/selectors/get_settings_specs';
Expand Down Expand Up @@ -115,8 +114,8 @@ function getCursorBand(
pointerPosition = {
x,
y: 0,
verticalPanelValue: DEFAULT_SINGLE_PANEL_SM_VALUE,
horizontalPanelValue: DEFAULT_SINGLE_PANEL_SM_VALUE,
verticalPanelValue: null,
horizontalPanelValue: null,
};
xValue = {
value: externalPointerEvent.value,
Expand Down
4 changes: 2 additions & 2 deletions src/chart_types/xy_chart/state/selectors/get_tooltip_position.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export const getTooltipAnchorPositionSelector = createCachedSelector(
return null;
}

const topPos = vertical.scale(projectedPointerPosition.verticalPanelValue) || 0;
const leftPos = horizontal.scale(projectedPointerPosition.horizontalPanelValue) || 0;
const topPos = vertical.scale(projectedPointerPosition.verticalPanelValue) ?? 0;
const leftPos = horizontal.scale(projectedPointerPosition.horizontalPanelValue) ?? 0;

const panel = {
width: horizontal.bandwidth,
Expand Down
Loading