Skip to content

Commit 4eb54ca

Browse files
authored
fix(packages): remove global from default props (#1544)
* fix(bar): remove `global` from default props * fix(calendar): remove `global` from default props * fix(chord): remove `global` from default props * fix(geo): remove `global` from default props * fix(heatmap): remove `global` from default props * fix(line): remove `global` from default props * fix(network): remove `global` from default props * fix(parallel-coordinates): remove `global` from default props * fix(scatterplot): remove `global` from default props * fix(swarmplot): remove `global` from default props * fix(treemap): remove `global` from default props * fix(waffle): remove `global` from default props
1 parent b820166 commit 4eb54ca

File tree

12 files changed

+12
-24
lines changed

12 files changed

+12
-24
lines changed

packages/bar/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ export const BarDefaultProps = {
152152

153153
annotations: [],
154154

155-
pixelRatio:
156-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
155+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
157156
}
158157

159158
export const BarSvgDefaultProps = {

packages/calendar/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,5 @@ export const CalendarDefaultProps = {
117117

118118
export const CalendarCanvasDefaultProps = {
119119
...commonDefaultProps,
120-
pixelRatio:
121-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
120+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
122121
}

packages/chord/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,5 @@ export const ChordDefaultProps = {
122122

123123
export const ChordCanvasDefaultProps = {
124124
...commonDefaultProps,
125-
pixelRatio:
126-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
125+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
127126
}

packages/geo/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ export const GeoMapDefaultProps = {
113113

114114
export const GeoMapCanvasDefaultProps = {
115115
...commonDefaultProps,
116-
pixelRatio:
117-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
116+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
118117
}
119118

120119
const commonChoroplethDefaultProps = {

packages/heatmap/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ export const HeatMapDefaultProps = {
9999
cellHoverOthersOpacity: 0.35,
100100

101101
// canvas specific
102-
pixelRatio:
103-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
102+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
104103
}
105104

106105
export const HeatMapSvgDefaultProps = {

packages/line/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,5 @@ export const LineDefaultProps = {
212212

213213
export const LineCanvasDefaultProps = {
214214
...commonDefaultProps,
215-
pixelRatio:
216-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
215+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
217216
}

packages/network/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,5 @@ export const NetworkDefaultProps = {
8383

8484
export const NetworkCanvasDefaultProps = {
8585
...commonDefaultProps,
86-
pixelRatio:
87-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
86+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
8887
}

packages/parallel-coordinates/src/ParallelCoordinatesCanvas.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ ParallelCoordinatesCanvas.propTypes = {
130130
const WrappedParallelCoordinatesCanvas = withContainer(ParallelCoordinatesCanvas)
131131
WrappedParallelCoordinatesCanvas.defaultProps = {
132132
...commonDefaultProps,
133-
pixelRatio:
134-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
133+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
135134
}
136135

137136
export default WrappedParallelCoordinatesCanvas

packages/scatterplot/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ export const ScatterPlotDefaultProps = {
151151
export const ScatterPlotCanvasDefaultProps = {
152152
...commonDefaultProps,
153153
layers: ['grid', 'axes', 'nodes', 'mesh', 'legends', 'annotations'],
154-
pixelRatio:
155-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
154+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
156155
}
157156

158157
export const NodePropType = PropTypes.shape({

packages/swarmplot/src/props.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,5 @@ export const SwarmPlotDefaultProps = {
132132

133133
export const SwarmPlotCanvasDefaultProps = {
134134
...commonDefaultProps,
135-
pixelRatio:
136-
global.window && global.window.devicePixelRatio ? global.window.devicePixelRatio : 1,
135+
pixelRatio: typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1,
137136
}

0 commit comments

Comments
 (0)