Skip to content

Commit 811a316

Browse files
committed
create DTicksInterval to keep visibility rules
1 parent 0e20d19 commit 811a316

File tree

5 files changed

+26
-1
lines changed

5 files changed

+26
-1
lines changed

src/components/fields/AxisInterval.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function getSmallestUnit(milliseconds) {
3636
return smallestUnit;
3737
}
3838

39-
class UnconnectedAxisInterval extends Component {
39+
export class UnconnectedAxisInterval extends Component {
4040
constructor(props) {
4141
super(props);
4242

src/components/fields/derived.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {UnconnectedNumeric} from './Numeric';
66
import {UnconnectedNumericOrDate} from './NumericOrDate';
77
import {UnconnectedAxisRangeValue} from './AxisRangeValue';
88
import {UnconnectedRadio} from './Radio';
9+
import {UnconnectedAxisInterval} from './AxisInterval';
910
import Info from './Info';
1011
import {UnconnectedColorPicker} from './ColorPicker';
1112
import {UnconnectedTextEditor} from './TextEditor';
@@ -226,6 +227,24 @@ export const DTicks = connectToContainer(UnconnectedAxisRangeValue, {
226227
},
227228
});
228229

230+
export const DTicksInterval = connectToContainer(UnconnectedAxisInterval, {
231+
modifyPlotProps: (props, context, plotProps) => {
232+
const {fullContainer} = plotProps;
233+
if (
234+
fullContainer &&
235+
fullContainer._name &&
236+
(fullContainer._name.startsWith('lat') || fullContainer._name.startsWith('lon'))
237+
) {
238+
// don't mess with visibility on geo axes
239+
return plotProps;
240+
}
241+
if (plotProps.isVisible && fullContainer && fullContainer.tickmode !== 'linear') {
242+
plotProps.isVisible = false;
243+
}
244+
return plotProps;
245+
},
246+
});
247+
229248
class UnconnectedNumericFraction extends UnconnectedNumeric {}
230249
UnconnectedNumericFraction.propTypes = UnconnectedNumeric.propTypes;
231250
UnconnectedNumericFraction.defaultProps = {

src/components/fields/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {
4040
AxesRange,
4141
NTicks,
4242
DTicks,
43+
DTicksInterval,
4344
AxisAnchorDropdown,
4445
ContourNumeric,
4546
FillDropdown,
@@ -72,6 +73,7 @@ export {
7273
AxesRange,
7374
NTicks,
7475
DTicks,
76+
DTicksInterval,
7577
AxesSelector,
7678
ColorPicker,
7779
ColorscalePicker,

src/components/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
AxesRange,
1010
NTicks,
1111
DTicks,
12+
DTicksInterval,
1213
AxesSelector,
1314
ColorPicker,
1415
ColorscalePicker,
@@ -103,6 +104,7 @@ export {
103104
AxisSide,
104105
NTicks,
105106
DTicks,
107+
DTicksInterval,
106108
ShapeAccordion,
107109
RangeSelectorAccordion,
108110
SliderAccordion,

src/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import {
3535
TransformAccordion,
3636
NTicks,
3737
DTicks,
38+
DTicksInterval,
3839
AxesSelector,
3940
PanelMessage,
4041
Button,
@@ -107,6 +108,7 @@ export {
107108
AxesRange,
108109
NTicks,
109110
DTicks,
111+
DTicksInterval,
110112
AxesSelector,
111113
Button,
112114
ColorPicker,

0 commit comments

Comments
 (0)