@deck.gl/react 8.6.0 → 8.6.4
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/dist/es5/deckgl.js +57 -85
- package/dist/es5/deckgl.js.map +1 -1
- package/dist/es5/index.js +2 -2
- package/dist/es5/utils/evaluate-children.js +5 -7
- package/dist/es5/utils/evaluate-children.js.map +1 -1
- package/dist/es5/utils/extract-jsx-layers.js +19 -22
- package/dist/es5/utils/extract-jsx-layers.js.map +1 -1
- package/dist/es5/utils/extract-styles.js +13 -12
- package/dist/es5/utils/extract-styles.js.map +1 -1
- package/dist/es5/utils/position-children-under-views.js +65 -78
- package/dist/es5/utils/position-children-under-views.js.map +1 -1
- package/dist/es5/utils/use-isomorphic-layout-effect.js +1 -1
- package/dist/es5/utils/use-isomorphic-layout-effect.js.map +1 -1
- package/package.json +2 -2
package/dist/es5/deckgl.js
CHANGED
|
@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
|
-
|
|
12
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
-
|
|
14
10
|
var _react = require("react");
|
|
15
11
|
|
|
16
12
|
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
@@ -25,26 +21,14 @@ var _positionChildrenUnderViews = _interopRequireDefault(require("./utils/positi
|
|
|
25
21
|
|
|
26
22
|
var _extractStyles = _interopRequireDefault(require("./utils/extract-styles"));
|
|
27
23
|
|
|
28
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
|
|
29
|
-
|
|
30
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
31
|
-
|
|
32
24
|
function getRefHandles(thisRef) {
|
|
33
|
-
|
|
34
|
-
pickObject:
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
pickMultipleObjects: function pickMultipleObjects(opts) {
|
|
38
|
-
return thisRef.deck.pickMultipleObjects(opts);
|
|
39
|
-
},
|
|
40
|
-
pickObjects: function pickObjects(opts) {
|
|
41
|
-
return thisRef.deck.pickObjects(opts);
|
|
42
|
-
}
|
|
25
|
+
const handles = {
|
|
26
|
+
pickObject: opts => thisRef.deck.pickObject(opts),
|
|
27
|
+
pickMultipleObjects: opts => thisRef.deck.pickMultipleObjects(opts),
|
|
28
|
+
pickObjects: opts => thisRef.deck.pickObjects(opts)
|
|
43
29
|
};
|
|
44
30
|
Object.defineProperty(handles, 'deck', {
|
|
45
|
-
get:
|
|
46
|
-
return thisRef.deck;
|
|
47
|
-
}
|
|
31
|
+
get: () => thisRef.deck
|
|
48
32
|
});
|
|
49
33
|
return handles;
|
|
50
34
|
}
|
|
@@ -58,46 +42,37 @@ function redrawDeck(thisRef) {
|
|
|
58
42
|
}
|
|
59
43
|
|
|
60
44
|
function createDeckInstance(thisRef, props) {
|
|
61
|
-
|
|
62
|
-
|
|
45
|
+
const DeckClass = props.Deck || _core.Deck;
|
|
46
|
+
const deck = new DeckClass({ ...props,
|
|
63
47
|
style: null,
|
|
64
48
|
width: '100%',
|
|
65
49
|
height: '100%',
|
|
66
|
-
_customRender:
|
|
50
|
+
_customRender: redrawReason => {
|
|
67
51
|
thisRef.redrawReason = redrawReason;
|
|
68
|
-
|
|
52
|
+
const viewports = deck.viewManager.getViewports();
|
|
69
53
|
|
|
70
54
|
if (thisRef.lastRenderedViewports !== viewports) {
|
|
71
|
-
thisRef.forceUpdate(
|
|
72
|
-
return v + 1;
|
|
73
|
-
});
|
|
55
|
+
thisRef.forceUpdate(v => v + 1);
|
|
74
56
|
} else {
|
|
75
57
|
redrawDeck(thisRef);
|
|
76
58
|
}
|
|
77
59
|
}
|
|
78
|
-
})
|
|
60
|
+
});
|
|
79
61
|
return deck;
|
|
80
62
|
}
|
|
81
63
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
var thisRef = _thisRef.current;
|
|
86
|
-
|
|
87
|
-
var _useState = (0, _react.useState)(0),
|
|
88
|
-
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
89
|
-
version = _useState2[0],
|
|
90
|
-
setVersion = _useState2[1];
|
|
64
|
+
const DeckGL = (0, _react.forwardRef)((props, ref) => {
|
|
65
|
+
const _thisRef = (0, _react.useRef)({});
|
|
91
66
|
|
|
67
|
+
const thisRef = _thisRef.current;
|
|
68
|
+
const [version, setVersion] = (0, _react.useState)(0);
|
|
92
69
|
thisRef.forceUpdate = setVersion;
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
var handleViewStateChange = function handleViewStateChange(params) {
|
|
70
|
+
const containerRef = (0, _react.useRef)(null);
|
|
71
|
+
const canvasRef = (0, _react.useRef)(null);
|
|
72
|
+
const jsxProps = (0, _react.useMemo)(() => (0, _extractJsxLayers.default)(props), [props.layers, props.views, props.children]);
|
|
73
|
+
let inRender = true;
|
|
74
|
+
|
|
75
|
+
const handleViewStateChange = params => {
|
|
101
76
|
if (inRender && props.viewState) {
|
|
102
77
|
thisRef.viewStateUpdateRequested = params;
|
|
103
78
|
return null;
|
|
@@ -107,7 +82,7 @@ var DeckGL = (0, _react.forwardRef)(function (props, ref) {
|
|
|
107
82
|
return props.onViewStateChange(params);
|
|
108
83
|
};
|
|
109
84
|
|
|
110
|
-
|
|
85
|
+
const handleInteractionStateChange = params => {
|
|
111
86
|
if (inRender) {
|
|
112
87
|
thisRef.interactionStateUpdateRequested = params;
|
|
113
88
|
} else {
|
|
@@ -116,8 +91,8 @@ var DeckGL = (0, _react.forwardRef)(function (props, ref) {
|
|
|
116
91
|
}
|
|
117
92
|
};
|
|
118
93
|
|
|
119
|
-
|
|
120
|
-
|
|
94
|
+
const deckProps = (0, _react.useMemo)(() => {
|
|
95
|
+
const forwardProps = { ...props,
|
|
121
96
|
style: null,
|
|
122
97
|
width: '100%',
|
|
123
98
|
height: '100%',
|
|
@@ -125,7 +100,7 @@ var DeckGL = (0, _react.forwardRef)(function (props, ref) {
|
|
|
125
100
|
views: jsxProps.views,
|
|
126
101
|
onViewStateChange: handleViewStateChange,
|
|
127
102
|
onInteractionStateChange: handleInteractionStateChange
|
|
128
|
-
}
|
|
103
|
+
};
|
|
129
104
|
|
|
130
105
|
if (thisRef.deck) {
|
|
131
106
|
thisRef.deck.setProps(forwardProps);
|
|
@@ -133,19 +108,19 @@ var DeckGL = (0, _react.forwardRef)(function (props, ref) {
|
|
|
133
108
|
|
|
134
109
|
return forwardProps;
|
|
135
110
|
}, [props]);
|
|
136
|
-
(0, _react.useEffect)(
|
|
137
|
-
thisRef.deck = createDeckInstance(thisRef,
|
|
111
|
+
(0, _react.useEffect)(() => {
|
|
112
|
+
thisRef.deck = createDeckInstance(thisRef, { ...deckProps,
|
|
138
113
|
parent: containerRef.current,
|
|
139
114
|
canvas: canvasRef.current
|
|
140
|
-
})
|
|
141
|
-
return
|
|
142
|
-
return thisRef.deck.finalize();
|
|
143
|
-
};
|
|
115
|
+
});
|
|
116
|
+
return () => thisRef.deck.finalize();
|
|
144
117
|
}, []);
|
|
145
|
-
(0, _useIsomorphicLayoutEffect.default)(
|
|
118
|
+
(0, _useIsomorphicLayoutEffect.default)(() => {
|
|
146
119
|
redrawDeck(thisRef);
|
|
147
|
-
|
|
148
|
-
|
|
120
|
+
const {
|
|
121
|
+
viewStateUpdateRequested,
|
|
122
|
+
interactionStateUpdateRequested
|
|
123
|
+
} = thisRef;
|
|
149
124
|
|
|
150
125
|
if (viewStateUpdateRequested) {
|
|
151
126
|
handleViewStateChange(viewStateUpdateRequested);
|
|
@@ -155,39 +130,36 @@ var DeckGL = (0, _react.forwardRef)(function (props, ref) {
|
|
|
155
130
|
handleInteractionStateChange(interactionStateUpdateRequested);
|
|
156
131
|
}
|
|
157
132
|
});
|
|
158
|
-
(0, _react.useImperativeHandle)(ref,
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}, [width, height, style]),
|
|
179
|
-
containerStyle = _useMemo.containerStyle,
|
|
180
|
-
canvasStyle = _useMemo.canvasStyle;
|
|
133
|
+
(0, _react.useImperativeHandle)(ref, () => getRefHandles(thisRef), []);
|
|
134
|
+
const {
|
|
135
|
+
viewManager
|
|
136
|
+
} = thisRef.deck || {};
|
|
137
|
+
const currentViewports = viewManager && viewManager.getViewports();
|
|
138
|
+
const {
|
|
139
|
+
ContextProvider,
|
|
140
|
+
width,
|
|
141
|
+
height,
|
|
142
|
+
id,
|
|
143
|
+
style
|
|
144
|
+
} = props;
|
|
145
|
+
const {
|
|
146
|
+
containerStyle,
|
|
147
|
+
canvasStyle
|
|
148
|
+
} = (0, _react.useMemo)(() => (0, _extractStyles.default)({
|
|
149
|
+
width,
|
|
150
|
+
height,
|
|
151
|
+
style
|
|
152
|
+
}), [width, height, style]);
|
|
181
153
|
|
|
182
154
|
if (!thisRef.viewStateUpdateRequested && thisRef.lastRenderedViewports === currentViewports || thisRef.version !== version) {
|
|
183
155
|
thisRef.lastRenderedViewports = currentViewports;
|
|
184
156
|
thisRef.version = version;
|
|
185
|
-
|
|
157
|
+
const childrenUnderViews = (0, _positionChildrenUnderViews.default)({
|
|
186
158
|
children: jsxProps.children,
|
|
187
159
|
deck: thisRef.deck,
|
|
188
|
-
ContextProvider
|
|
160
|
+
ContextProvider
|
|
189
161
|
});
|
|
190
|
-
|
|
162
|
+
const canvas = (0, _react.createElement)('canvas', {
|
|
191
163
|
key: 'canvas',
|
|
192
164
|
id: id || 'deckgl-overlay',
|
|
193
165
|
ref: canvasRef,
|
package/dist/es5/deckgl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/deckgl.js"],"names":["getRefHandles","thisRef","handles","pickObject","opts","deck","pickMultipleObjects","pickObjects","Object","defineProperty","get","redrawDeck","redrawReason","_drawLayers","createDeckInstance","props","DeckClass","Deck","style","width","height","_customRender","viewports","viewManager","getViewports","lastRenderedViewports","forceUpdate","v","DeckGL","ref","_thisRef","current","version","setVersion","containerRef","canvasRef","jsxProps","layers","views","children","inRender","handleViewStateChange","params","viewState","viewStateUpdateRequested","onViewStateChange","handleInteractionStateChange","interactionStateUpdateRequested","onInteractionStateChange","deckProps","forwardProps","setProps","parent","canvas","finalize","currentViewports","ContextProvider","id","containerStyle","canvasStyle","childrenUnderViews","key","control","propTypes","getPropTypes","PropTypes","defaultProps"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {\n createElement,\n useRef,\n useState,\n useMemo,\n useEffect,\n useImperativeHandle,\n forwardRef\n} from 'react';\nimport PropTypes from 'prop-types';\nimport {Deck} from '@deck.gl/core';\nimport useIsomorphicLayoutEffect from './utils/use-isomorphic-layout-effect';\n\nimport extractJSXLayers from './utils/extract-jsx-layers';\nimport positionChildrenUnderViews from './utils/position-children-under-views';\nimport extractStyles from './utils/extract-styles';\n\n/* eslint-disable max-statements, accessor-pairs */\n\nfunction getRefHandles(thisRef) {\n const handles = {\n pickObject: opts => thisRef.deck.pickObject(opts),\n pickMultipleObjects: opts => thisRef.deck.pickMultipleObjects(opts),\n pickObjects: opts => thisRef.deck.pickObjects(opts)\n };\n Object.defineProperty(handles, 'deck', {\n get: () => thisRef.deck\n });\n return handles;\n}\n\nfunction redrawDeck(thisRef) {\n if (thisRef.redrawReason) {\n // Only redraw if we have received a dirty flag\n thisRef.deck._drawLayers(thisRef.redrawReason);\n thisRef.redrawReason = null;\n }\n}\n\nfunction createDeckInstance(thisRef, props) {\n // Allows a subclass of Deck to be used\n // TODO - update propTypes / defaultProps?\n const DeckClass = props.Deck || Deck;\n const deck = new DeckClass({\n ...props,\n style: null,\n width: '100%',\n height: '100%',\n // The Deck's animation loop is independent from React's render cycle, causing potential\n // synchronization issues. We provide this custom render function to make sure that React\n // and Deck update on the same schedule.\n _customRender: redrawReason => {\n // Save the dirty flag for later\n thisRef.redrawReason = redrawReason;\n\n // Viewport/view state is passed to child components as props.\n // If they have changed, we need to trigger a React rerender to update children props.\n const viewports = deck.viewManager.getViewports();\n if (thisRef.lastRenderedViewports !== viewports) {\n // Viewports have changed, update children props first.\n // This will delay the Deck canvas redraw till after React update (in useLayoutEffect)\n // so that the canvas does not get rendered before the child components update.\n thisRef.forceUpdate(v => v + 1);\n } else {\n redrawDeck(thisRef);\n }\n }\n });\n return deck;\n}\n\nconst DeckGL = forwardRef((props, ref) => {\n // A reference to persistent states\n const _thisRef = useRef({});\n const thisRef = _thisRef.current;\n // A mechanism to force redraw\n const [version, setVersion] = useState(0);\n thisRef.forceUpdate = setVersion;\n // DOM refs\n const containerRef = useRef(null);\n const canvasRef = useRef(null);\n\n // extract any deck.gl layers masquerading as react elements from props.children\n const jsxProps = useMemo(() => extractJSXLayers(props), [\n props.layers,\n props.views,\n props.children\n ]);\n\n // Callbacks\n let inRender = true;\n\n const handleViewStateChange = params => {\n if (inRender && props.viewState) {\n // Callback may invoke a state update. Defer callback to after render() to avoid React error\n // In React StrictMode, render is executed twice and useEffect/useLayoutEffect is executed once\n // Store deferred parameters in ref so that we can access it in another render\n thisRef.viewStateUpdateRequested = params;\n return null;\n }\n thisRef.viewStateUpdateRequested = null;\n return props.onViewStateChange(params);\n };\n\n const handleInteractionStateChange = params => {\n if (inRender) {\n // Callback may invoke a state update. Defer callback to after render() to avoid React error\n // In React StrictMode, render is executed twice and useEffect/useLayoutEffect is executed once\n // Store deferred parameters in ref so that we can access it in another render\n thisRef.interactionStateUpdateRequested = params;\n } else {\n thisRef.interactionStateUpdateRequested = null;\n props.onInteractionStateChange(params);\n }\n };\n\n // Update Deck's props. If Deck needs redraw, this will trigger a call to `_customRender` in\n // the next animation frame.\n // Needs to be called both from initial mount, and when new props are received\n const deckProps = useMemo(\n () => {\n const forwardProps = {\n ...props,\n // Override user styling props. We will set the canvas style in render()\n style: null,\n width: '100%',\n height: '100%',\n layers: jsxProps.layers,\n views: jsxProps.views,\n onViewStateChange: handleViewStateChange,\n onInteractionStateChange: handleInteractionStateChange\n };\n\n if (thisRef.deck) {\n thisRef.deck.setProps(forwardProps);\n }\n\n return forwardProps;\n },\n [props]\n );\n\n useEffect(() => {\n thisRef.deck = createDeckInstance(thisRef, {\n ...deckProps,\n parent: containerRef.current,\n canvas: canvasRef.current\n });\n\n return () => thisRef.deck.finalize();\n }, []);\n\n useIsomorphicLayoutEffect(() => {\n // render has just been called. The children are positioned based on the current view state.\n // Redraw Deck canvas immediately, if necessary, using the current view state, so that it\n // matches the child components.\n redrawDeck(thisRef);\n\n // Execute deferred callbacks\n const {viewStateUpdateRequested, interactionStateUpdateRequested} = thisRef;\n if (viewStateUpdateRequested) {\n handleViewStateChange(viewStateUpdateRequested);\n }\n if (interactionStateUpdateRequested) {\n handleInteractionStateChange(interactionStateUpdateRequested);\n }\n });\n\n useImperativeHandle(ref, () => getRefHandles(thisRef), []);\n\n const {viewManager} = thisRef.deck || {};\n const currentViewports = viewManager && viewManager.getViewports();\n\n const {ContextProvider, width, height, id, style} = props;\n\n const {containerStyle, canvasStyle} = useMemo(() => extractStyles({width, height, style}), [\n width,\n height,\n style\n ]);\n\n // Props changes may lead to 3 types of updates:\n // 1. Only the WebGL canvas - updated in Deck's render cycle (next animation frame)\n // 2. Only the DOM - updated in React's lifecycle (now)\n // 3. Both the WebGL canvas and the DOM - defer React rerender to next animation frame just\n // before Deck redraw to ensure perfect synchronization & avoid excessive redraw\n // This is because multiple changes may happen to Deck between two frames e.g. transition\n if (\n (!thisRef.viewStateUpdateRequested && thisRef.lastRenderedViewports === currentViewports) || // case 2\n thisRef.version !== version // case 3 just before deck redraws\n ) {\n thisRef.lastRenderedViewports = currentViewports;\n thisRef.version = version;\n\n // Render the background elements (typically react-map-gl instances)\n // using the view descriptors\n const childrenUnderViews = positionChildrenUnderViews({\n children: jsxProps.children,\n deck: thisRef.deck,\n ContextProvider\n });\n\n const canvas = createElement('canvas', {\n key: 'canvas',\n id: id || 'deckgl-overlay',\n ref: canvasRef,\n style: canvasStyle\n });\n\n // Render deck.gl as the last child\n thisRef.control = createElement(\n 'div',\n {id: `${id || 'deckgl'}-wrapper`, ref: containerRef, style: containerStyle},\n [canvas, childrenUnderViews]\n );\n }\n\n inRender = false;\n return thisRef.control;\n});\n\nDeckGL.propTypes = Deck.getPropTypes(PropTypes);\nDeckGL.defaultProps = Deck.defaultProps;\n\nexport default DeckGL;\n"],"file":"deckgl.js"}
|
|
1
|
+
{"version":3,"sources":["../../src/deckgl.js"],"names":["getRefHandles","thisRef","handles","pickObject","opts","deck","pickMultipleObjects","pickObjects","Object","defineProperty","get","redrawDeck","redrawReason","_drawLayers","createDeckInstance","props","DeckClass","Deck","style","width","height","_customRender","viewports","viewManager","getViewports","lastRenderedViewports","forceUpdate","v","DeckGL","ref","_thisRef","current","version","setVersion","containerRef","canvasRef","jsxProps","layers","views","children","inRender","handleViewStateChange","params","viewState","viewStateUpdateRequested","onViewStateChange","handleInteractionStateChange","interactionStateUpdateRequested","onInteractionStateChange","deckProps","forwardProps","setProps","parent","canvas","finalize","currentViewports","ContextProvider","id","containerStyle","canvasStyle","childrenUnderViews","key","control","propTypes","getPropTypes","PropTypes","defaultProps"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {\n createElement,\n useRef,\n useState,\n useMemo,\n useEffect,\n useImperativeHandle,\n forwardRef\n} from 'react';\nimport PropTypes from 'prop-types';\nimport {Deck} from '@deck.gl/core';\nimport useIsomorphicLayoutEffect from './utils/use-isomorphic-layout-effect';\n\nimport extractJSXLayers from './utils/extract-jsx-layers';\nimport positionChildrenUnderViews from './utils/position-children-under-views';\nimport extractStyles from './utils/extract-styles';\n\n/* eslint-disable max-statements, accessor-pairs */\n\nfunction getRefHandles(thisRef) {\n const handles = {\n pickObject: opts => thisRef.deck.pickObject(opts),\n pickMultipleObjects: opts => thisRef.deck.pickMultipleObjects(opts),\n pickObjects: opts => thisRef.deck.pickObjects(opts)\n };\n Object.defineProperty(handles, 'deck', {\n get: () => thisRef.deck\n });\n return handles;\n}\n\nfunction redrawDeck(thisRef) {\n if (thisRef.redrawReason) {\n // Only redraw if we have received a dirty flag\n thisRef.deck._drawLayers(thisRef.redrawReason);\n thisRef.redrawReason = null;\n }\n}\n\nfunction createDeckInstance(thisRef, props) {\n // Allows a subclass of Deck to be used\n // TODO - update propTypes / defaultProps?\n const DeckClass = props.Deck || Deck;\n const deck = new DeckClass({\n ...props,\n style: null,\n width: '100%',\n height: '100%',\n // The Deck's animation loop is independent from React's render cycle, causing potential\n // synchronization issues. We provide this custom render function to make sure that React\n // and Deck update on the same schedule.\n _customRender: redrawReason => {\n // Save the dirty flag for later\n thisRef.redrawReason = redrawReason;\n\n // Viewport/view state is passed to child components as props.\n // If they have changed, we need to trigger a React rerender to update children props.\n const viewports = deck.viewManager.getViewports();\n if (thisRef.lastRenderedViewports !== viewports) {\n // Viewports have changed, update children props first.\n // This will delay the Deck canvas redraw till after React update (in useLayoutEffect)\n // so that the canvas does not get rendered before the child components update.\n thisRef.forceUpdate(v => v + 1);\n } else {\n redrawDeck(thisRef);\n }\n }\n });\n return deck;\n}\n\nconst DeckGL = forwardRef((props, ref) => {\n // A reference to persistent states\n const _thisRef = useRef({});\n const thisRef = _thisRef.current;\n // A mechanism to force redraw\n const [version, setVersion] = useState(0);\n thisRef.forceUpdate = setVersion;\n // DOM refs\n const containerRef = useRef(null);\n const canvasRef = useRef(null);\n\n // extract any deck.gl layers masquerading as react elements from props.children\n const jsxProps = useMemo(() => extractJSXLayers(props), [\n props.layers,\n props.views,\n props.children\n ]);\n\n // Callbacks\n let inRender = true;\n\n const handleViewStateChange = params => {\n if (inRender && props.viewState) {\n // Callback may invoke a state update. Defer callback to after render() to avoid React error\n // In React StrictMode, render is executed twice and useEffect/useLayoutEffect is executed once\n // Store deferred parameters in ref so that we can access it in another render\n thisRef.viewStateUpdateRequested = params;\n return null;\n }\n thisRef.viewStateUpdateRequested = null;\n return props.onViewStateChange(params);\n };\n\n const handleInteractionStateChange = params => {\n if (inRender) {\n // Callback may invoke a state update. Defer callback to after render() to avoid React error\n // In React StrictMode, render is executed twice and useEffect/useLayoutEffect is executed once\n // Store deferred parameters in ref so that we can access it in another render\n thisRef.interactionStateUpdateRequested = params;\n } else {\n thisRef.interactionStateUpdateRequested = null;\n props.onInteractionStateChange(params);\n }\n };\n\n // Update Deck's props. If Deck needs redraw, this will trigger a call to `_customRender` in\n // the next animation frame.\n // Needs to be called both from initial mount, and when new props are received\n const deckProps = useMemo(\n () => {\n const forwardProps = {\n ...props,\n // Override user styling props. We will set the canvas style in render()\n style: null,\n width: '100%',\n height: '100%',\n layers: jsxProps.layers,\n views: jsxProps.views,\n onViewStateChange: handleViewStateChange,\n onInteractionStateChange: handleInteractionStateChange\n };\n\n if (thisRef.deck) {\n thisRef.deck.setProps(forwardProps);\n }\n\n return forwardProps;\n },\n [props]\n );\n\n useEffect(() => {\n thisRef.deck = createDeckInstance(thisRef, {\n ...deckProps,\n parent: containerRef.current,\n canvas: canvasRef.current\n });\n\n return () => thisRef.deck.finalize();\n }, []);\n\n useIsomorphicLayoutEffect(() => {\n // render has just been called. The children are positioned based on the current view state.\n // Redraw Deck canvas immediately, if necessary, using the current view state, so that it\n // matches the child components.\n redrawDeck(thisRef);\n\n // Execute deferred callbacks\n const {viewStateUpdateRequested, interactionStateUpdateRequested} = thisRef;\n if (viewStateUpdateRequested) {\n handleViewStateChange(viewStateUpdateRequested);\n }\n if (interactionStateUpdateRequested) {\n handleInteractionStateChange(interactionStateUpdateRequested);\n }\n });\n\n useImperativeHandle(ref, () => getRefHandles(thisRef), []);\n\n const {viewManager} = thisRef.deck || {};\n const currentViewports = viewManager && viewManager.getViewports();\n\n const {ContextProvider, width, height, id, style} = props;\n\n const {containerStyle, canvasStyle} = useMemo(() => extractStyles({width, height, style}), [\n width,\n height,\n style\n ]);\n\n // Props changes may lead to 3 types of updates:\n // 1. Only the WebGL canvas - updated in Deck's render cycle (next animation frame)\n // 2. Only the DOM - updated in React's lifecycle (now)\n // 3. Both the WebGL canvas and the DOM - defer React rerender to next animation frame just\n // before Deck redraw to ensure perfect synchronization & avoid excessive redraw\n // This is because multiple changes may happen to Deck between two frames e.g. transition\n if (\n (!thisRef.viewStateUpdateRequested && thisRef.lastRenderedViewports === currentViewports) || // case 2\n thisRef.version !== version // case 3 just before deck redraws\n ) {\n thisRef.lastRenderedViewports = currentViewports;\n thisRef.version = version;\n\n // Render the background elements (typically react-map-gl instances)\n // using the view descriptors\n const childrenUnderViews = positionChildrenUnderViews({\n children: jsxProps.children,\n deck: thisRef.deck,\n ContextProvider\n });\n\n const canvas = createElement('canvas', {\n key: 'canvas',\n id: id || 'deckgl-overlay',\n ref: canvasRef,\n style: canvasStyle\n });\n\n // Render deck.gl as the last child\n thisRef.control = createElement(\n 'div',\n {id: `${id || 'deckgl'}-wrapper`, ref: containerRef, style: containerStyle},\n [canvas, childrenUnderViews]\n );\n }\n\n inRender = false;\n return thisRef.control;\n});\n\nDeckGL.propTypes = Deck.getPropTypes(PropTypes);\nDeckGL.defaultProps = Deck.defaultProps;\n\nexport default DeckGL;\n"],"file":"deckgl.js"}
|
package/dist/es5/index.js
CHANGED
|
@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
Object.defineProperty(exports, "DeckGL", {
|
|
9
9
|
enumerable: true,
|
|
10
|
-
get: function
|
|
10
|
+
get: function () {
|
|
11
11
|
return _deckgl.default;
|
|
12
12
|
}
|
|
13
13
|
});
|
|
14
14
|
Object.defineProperty(exports, "default", {
|
|
15
15
|
enumerable: true,
|
|
16
|
-
get: function
|
|
16
|
+
get: function () {
|
|
17
17
|
return _deckgl.default;
|
|
18
18
|
}
|
|
19
19
|
});
|
|
@@ -7,7 +7,7 @@ exports.default = evaluateChildren;
|
|
|
7
7
|
|
|
8
8
|
var _react = require("react");
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
const MAP_STYLE = {
|
|
11
11
|
position: 'absolute',
|
|
12
12
|
zIndex: -1
|
|
13
13
|
};
|
|
@@ -22,9 +22,7 @@ function evaluateChildren(children, childProps) {
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
if (Array.isArray(children)) {
|
|
25
|
-
return children.map(
|
|
26
|
-
return evaluateChildren(child, childProps);
|
|
27
|
-
});
|
|
25
|
+
return children.map(child => evaluateChildren(child, childProps));
|
|
28
26
|
}
|
|
29
27
|
|
|
30
28
|
if (isReactMap(children)) {
|
|
@@ -40,13 +38,13 @@ function evaluateChildren(children, childProps) {
|
|
|
40
38
|
}
|
|
41
39
|
|
|
42
40
|
function isReactMap(child) {
|
|
43
|
-
|
|
44
|
-
|
|
41
|
+
const componentClass = child && child.type;
|
|
42
|
+
const componentProps = componentClass && componentClass.defaultProps;
|
|
45
43
|
return componentProps && componentProps.mapStyle;
|
|
46
44
|
}
|
|
47
45
|
|
|
48
46
|
function needsDeckGLViewProps(child) {
|
|
49
|
-
|
|
47
|
+
const componentClass = child && child.type;
|
|
50
48
|
return componentClass && componentClass.deckGLViewProps;
|
|
51
49
|
}
|
|
52
50
|
//# sourceMappingURL=evaluate-children.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/utils/evaluate-children.js"],"names":["MAP_STYLE","position","zIndex","evaluateChildren","children","childProps","Array","isArray","map","child","isReactMap","style","needsDeckGLViewProps","componentClass","type","componentProps","defaultProps","mapStyle","deckGLViewProps"],"mappings":";;;;;;;AAAA;;AAEA,
|
|
1
|
+
{"version":3,"sources":["../../../src/utils/evaluate-children.js"],"names":["MAP_STYLE","position","zIndex","evaluateChildren","children","childProps","Array","isArray","map","child","isReactMap","style","needsDeckGLViewProps","componentClass","type","componentProps","defaultProps","mapStyle","deckGLViewProps"],"mappings":";;;;;;;AAAA;;AAEA,MAAMA,SAAS,GAAG;AAACC,EAAAA,QAAQ,EAAE,UAAX;AAAuBC,EAAAA,MAAM,EAAE,CAAC;AAAhC,CAAlB;;AAEe,SAASC,gBAAT,CAA0BC,QAA1B,EAAoCC,UAApC,EAAgD;AAC7D,MAAI,CAACD,QAAL,EAAe;AACb,WAAOA,QAAP;AACD;;AACD,MAAI,OAAOA,QAAP,KAAoB,UAAxB,EAAoC;AAClC,WAAOA,QAAQ,CAACC,UAAD,CAAf;AACD;;AACD,MAAIC,KAAK,CAACC,OAAN,CAAcH,QAAd,CAAJ,EAA6B;AAC3B,WAAOA,QAAQ,CAACI,GAAT,CAAaC,KAAK,IAAIN,gBAAgB,CAACM,KAAD,EAAQJ,UAAR,CAAtC,CAAP;AACD;;AAID,MAAIK,UAAU,CAACN,QAAD,CAAd,EAA0B;AAExBC,IAAAA,UAAU,CAACM,KAAX,GAAmBX,SAAnB;AACA,WAAO,yBAAaI,QAAb,EAAuBC,UAAvB,CAAP;AACD;;AACD,MAAIO,oBAAoB,CAACR,QAAD,CAAxB,EAAoC;AAClC,WAAO,yBAAaA,QAAb,EAAuBC,UAAvB,CAAP;AACD;;AACD,SAAOD,QAAP;AACD;;AAED,SAASM,UAAT,CAAoBD,KAApB,EAA2B;AACzB,QAAMI,cAAc,GAAGJ,KAAK,IAAIA,KAAK,CAACK,IAAtC;AACA,QAAMC,cAAc,GAAGF,cAAc,IAAIA,cAAc,CAACG,YAAxD;AACA,SAAOD,cAAc,IAAIA,cAAc,CAACE,QAAxC;AACD;;AAED,SAASL,oBAAT,CAA8BH,KAA9B,EAAqC;AACnC,QAAMI,cAAc,GAAGJ,KAAK,IAAIA,KAAK,CAACK,IAAtC;AACA,SAAOD,cAAc,IAAIA,cAAc,CAACK,eAAxC;AACD","sourcesContent":["import {cloneElement} from 'react';\n\nconst MAP_STYLE = {position: 'absolute', zIndex: -1};\n\nexport default function evaluateChildren(children, childProps) {\n if (!children) {\n return children;\n }\n if (typeof children === 'function') {\n return children(childProps);\n }\n if (Array.isArray(children)) {\n return children.map(child => evaluateChildren(child, childProps));\n }\n\n // Special treatment for react-map-gl's Map component\n // to support shorthand use case <DeckGL><StaticMap /></DeckGL>\n if (isReactMap(children)) {\n // Place map under the canvas\n childProps.style = MAP_STYLE;\n return cloneElement(children, childProps);\n }\n if (needsDeckGLViewProps(children)) {\n return cloneElement(children, childProps);\n }\n return children;\n}\n\nfunction isReactMap(child) {\n const componentClass = child && child.type;\n const componentProps = componentClass && componentClass.defaultProps;\n return componentProps && componentProps.mapStyle;\n}\n\nfunction needsDeckGLViewProps(child) {\n const componentClass = child && child.type;\n return componentClass && componentClass.deckGLViewProps;\n}\n"],"file":"evaluate-children.js"}
|
|
@@ -2,15 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
|
|
4
4
|
|
|
5
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.default = extractJSXLayers;
|
|
11
9
|
|
|
12
|
-
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
13
|
-
|
|
14
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
15
11
|
|
|
16
12
|
var _inheritsFrom = require("./inherits-from");
|
|
@@ -41,27 +37,28 @@ function wrapInView(node) {
|
|
|
41
37
|
return node;
|
|
42
38
|
}
|
|
43
39
|
|
|
44
|
-
function extractJSXLayers(
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
40
|
+
function extractJSXLayers({
|
|
41
|
+
children,
|
|
42
|
+
layers,
|
|
43
|
+
views
|
|
44
|
+
}) {
|
|
45
|
+
const reactChildren = [];
|
|
46
|
+
const jsxLayers = [];
|
|
47
|
+
const jsxViews = {};
|
|
51
48
|
|
|
52
|
-
_react.default.Children.forEach(wrapInView(children),
|
|
49
|
+
_react.default.Children.forEach(wrapInView(children), reactElement => {
|
|
53
50
|
if (reactElement) {
|
|
54
|
-
|
|
51
|
+
const ElementType = reactElement.type;
|
|
55
52
|
|
|
56
53
|
if ((0, _inheritsFrom.inheritsFrom)(ElementType, _core.Layer)) {
|
|
57
|
-
|
|
54
|
+
const layer = createLayer(ElementType, reactElement.props);
|
|
58
55
|
jsxLayers.push(layer);
|
|
59
56
|
} else {
|
|
60
57
|
reactChildren.push(reactElement);
|
|
61
58
|
}
|
|
62
59
|
|
|
63
60
|
if (ElementType !== _core.View && (0, _inheritsFrom.inheritsFrom)(ElementType, _core.View) && reactElement.props.id) {
|
|
64
|
-
|
|
61
|
+
const view = new ElementType(reactElement.props);
|
|
65
62
|
jsxViews[view.id] = view;
|
|
66
63
|
}
|
|
67
64
|
}
|
|
@@ -69,7 +66,7 @@ function extractJSXLayers(_ref) {
|
|
|
69
66
|
|
|
70
67
|
if (Object.keys(jsxViews).length > 0) {
|
|
71
68
|
if (Array.isArray(views)) {
|
|
72
|
-
views.forEach(
|
|
69
|
+
views.forEach(view => {
|
|
73
70
|
jsxViews[view.id] = view;
|
|
74
71
|
});
|
|
75
72
|
} else if (views) {
|
|
@@ -79,19 +76,19 @@ function extractJSXLayers(_ref) {
|
|
|
79
76
|
views = Object.values(jsxViews);
|
|
80
77
|
}
|
|
81
78
|
|
|
82
|
-
layers = jsxLayers.length > 0 ? [
|
|
79
|
+
layers = jsxLayers.length > 0 ? [...jsxLayers, ...layers] : layers;
|
|
83
80
|
return {
|
|
84
|
-
layers
|
|
81
|
+
layers,
|
|
85
82
|
children: reactChildren,
|
|
86
|
-
views
|
|
83
|
+
views
|
|
87
84
|
};
|
|
88
85
|
}
|
|
89
86
|
|
|
90
87
|
function createLayer(LayerType, reactProps) {
|
|
91
|
-
|
|
92
|
-
|
|
88
|
+
const props = {};
|
|
89
|
+
const defaultProps = LayerType.defaultProps || {};
|
|
93
90
|
|
|
94
|
-
for (
|
|
91
|
+
for (const key in reactProps) {
|
|
95
92
|
if (defaultProps[key] !== reactProps[key]) {
|
|
96
93
|
props[key] = reactProps[key];
|
|
97
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/utils/extract-jsx-layers.js"],"names":["wrapInView","node","View","Array","isArray","map","type","React","Fragment","props","children","extractJSXLayers","layers","views","reactChildren","jsxLayers","jsxViews","Children","forEach","reactElement","ElementType","Layer","layer","createLayer","push","id","view","Object","keys","length","values","LayerType","reactProps","defaultProps","key"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/utils/extract-jsx-layers.js"],"names":["wrapInView","node","View","Array","isArray","map","type","React","Fragment","props","children","extractJSXLayers","layers","views","reactChildren","jsxLayers","jsxViews","Children","forEach","reactElement","ElementType","Layer","layer","createLayer","push","id","view","Object","keys","length","values","LayerType","reactProps","defaultProps","key"],"mappings":"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","sourcesContent":["import React, {createElement} from 'react';\nimport {inheritsFrom} from './inherits-from';\nimport {Layer, View} from '@deck.gl/core';\n\n// recursively wrap render callbacks in `View`\nfunction wrapInView(node) {\n if (!node) {\n return node;\n }\n if (typeof node === 'function') {\n // React.Children does not traverse functions.\n // All render callbacks must be protected under a <View>\n return createElement(View, {}, node);\n }\n if (Array.isArray(node)) {\n return node.map(wrapInView);\n }\n if (node.type === React.Fragment) {\n return wrapInView(node.props.children);\n }\n if (inheritsFrom(node.type, View)) {\n return node;\n }\n return node;\n}\n\n// extracts any deck.gl layers masquerading as react elements from props.children\nexport default function extractJSXLayers({children, layers, views}) {\n const reactChildren = []; // extract real react elements (i.e. not deck.gl layers)\n const jsxLayers = []; // extracted layer from react children, will add to deck.gl layer array\n const jsxViews = {};\n\n // React.children\n React.Children.forEach(wrapInView(children), reactElement => {\n if (reactElement) {\n // For some reason Children.forEach doesn't filter out `null`s\n const ElementType = reactElement.type;\n if (inheritsFrom(ElementType, Layer)) {\n const layer = createLayer(ElementType, reactElement.props);\n jsxLayers.push(layer);\n } else {\n reactChildren.push(reactElement);\n }\n\n // empty id => default view\n if (ElementType !== View && inheritsFrom(ElementType, View) && reactElement.props.id) {\n const view = new ElementType(reactElement.props);\n jsxViews[view.id] = view;\n }\n }\n });\n\n // Avoid modifying views if no JSX views were found\n if (Object.keys(jsxViews).length > 0) {\n // If a view is specified in both views prop and JSX, use the one in views\n if (Array.isArray(views)) {\n views.forEach(view => {\n jsxViews[view.id] = view;\n });\n } else if (views) {\n jsxViews[views.id] = views;\n }\n views = Object.values(jsxViews);\n }\n\n // Avoid modifying layers array if no JSX layers were found\n layers = jsxLayers.length > 0 ? [...jsxLayers, ...layers] : layers;\n\n return {layers, children: reactChildren, views};\n}\n\nfunction createLayer(LayerType, reactProps) {\n const props = {};\n // Layer.defaultProps is treated as ReactElement.defaultProps and merged into react props\n // Remove them\n const defaultProps = LayerType.defaultProps || {};\n for (const key in reactProps) {\n if (defaultProps[key] !== reactProps[key]) {\n props[key] = reactProps[key];\n }\n }\n return new LayerType(props);\n}\n"],"file":"extract-jsx-layers.js"}
|
|
@@ -4,29 +4,30 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = extractStyles;
|
|
7
|
-
|
|
7
|
+
const CANVAS_ONLY_STYLES = {
|
|
8
8
|
mixBlendMode: null
|
|
9
9
|
};
|
|
10
10
|
|
|
11
|
-
function extractStyles(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
function extractStyles({
|
|
12
|
+
width,
|
|
13
|
+
height,
|
|
14
|
+
style
|
|
15
|
+
}) {
|
|
16
|
+
const containerStyle = {
|
|
16
17
|
position: 'absolute',
|
|
17
18
|
zIndex: 0,
|
|
18
19
|
left: 0,
|
|
19
20
|
top: 0,
|
|
20
|
-
width
|
|
21
|
-
height
|
|
21
|
+
width,
|
|
22
|
+
height
|
|
22
23
|
};
|
|
23
|
-
|
|
24
|
+
const canvasStyle = {
|
|
24
25
|
left: 0,
|
|
25
26
|
top: 0
|
|
26
27
|
};
|
|
27
28
|
|
|
28
29
|
if (style) {
|
|
29
|
-
for (
|
|
30
|
+
for (const key in style) {
|
|
30
31
|
if (key in CANVAS_ONLY_STYLES) {
|
|
31
32
|
canvasStyle[key] = style[key];
|
|
32
33
|
} else {
|
|
@@ -36,8 +37,8 @@ function extractStyles(_ref) {
|
|
|
36
37
|
}
|
|
37
38
|
|
|
38
39
|
return {
|
|
39
|
-
containerStyle
|
|
40
|
-
canvasStyle
|
|
40
|
+
containerStyle,
|
|
41
|
+
canvasStyle
|
|
41
42
|
};
|
|
42
43
|
}
|
|
43
44
|
//# sourceMappingURL=extract-styles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/utils/extract-styles.js"],"names":["CANVAS_ONLY_STYLES","mixBlendMode","extractStyles","width","height","style","containerStyle","position","zIndex","left","top","canvasStyle","key"],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/utils/extract-styles.js"],"names":["CANVAS_ONLY_STYLES","mixBlendMode","extractStyles","width","height","style","containerStyle","position","zIndex","left","top","canvasStyle","key"],"mappings":";;;;;;AAAA,MAAMA,kBAAkB,GAAG;AACzBC,EAAAA,YAAY,EAAE;AADW,CAA3B;;AAIe,SAASC,aAAT,CAAuB;AAACC,EAAAA,KAAD;AAAQC,EAAAA,MAAR;AAAgBC,EAAAA;AAAhB,CAAvB,EAA+C;AAE5D,QAAMC,cAAc,GAAG;AACrBC,IAAAA,QAAQ,EAAE,UADW;AAErBC,IAAAA,MAAM,EAAE,CAFa;AAGrBC,IAAAA,IAAI,EAAE,CAHe;AAIrBC,IAAAA,GAAG,EAAE,CAJgB;AAKrBP,IAAAA,KALqB;AAMrBC,IAAAA;AANqB,GAAvB;AAUA,QAAMO,WAAW,GAAG;AAClBF,IAAAA,IAAI,EAAE,CADY;AAElBC,IAAAA,GAAG,EAAE;AAFa,GAApB;;AAKA,MAAIL,KAAJ,EAAW;AACT,SAAK,MAAMO,GAAX,IAAkBP,KAAlB,EAAyB;AACvB,UAAIO,GAAG,IAAIZ,kBAAX,EAA+B;AAE7BW,QAAAA,WAAW,CAACC,GAAD,CAAX,GAAmBP,KAAK,CAACO,GAAD,CAAxB;AACD,OAHD,MAGO;AAELN,QAAAA,cAAc,CAACM,GAAD,CAAd,GAAsBP,KAAK,CAACO,GAAD,CAA3B;AACD;AACF;AACF;;AAED,SAAO;AAACN,IAAAA,cAAD;AAAiBK,IAAAA;AAAjB,GAAP;AACD","sourcesContent":["const CANVAS_ONLY_STYLES = {\n mixBlendMode: null\n};\n\nexport default function extractStyles({width, height, style}) {\n // This styling is enforced for correct positioning with children\n const containerStyle = {\n position: 'absolute',\n zIndex: 0,\n left: 0,\n top: 0,\n width,\n height\n };\n\n // Fill the container\n const canvasStyle = {\n left: 0,\n top: 0\n };\n\n if (style) {\n for (const key in style) {\n if (key in CANVAS_ONLY_STYLES) {\n // apply style to the canvas, but not deck's children, e.g. mix-blend-mode\n canvasStyle[key] = style[key];\n } else {\n // apply style to the container, e.g. position/flow settings\n containerStyle[key] = style[key];\n }\n }\n }\n\n return {containerStyle, canvasStyle};\n}\n"],"file":"extract-styles.js"}
|
|
@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = positionChildrenUnderViews;
|
|
9
9
|
|
|
10
|
-
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
11
|
-
|
|
12
10
|
var _react = require("react");
|
|
13
11
|
|
|
14
12
|
var _core = require("@deck.gl/core");
|
|
@@ -17,110 +15,99 @@ var _inheritsFrom = require("./inherits-from");
|
|
|
17
15
|
|
|
18
16
|
var _evaluateChildren = _interopRequireDefault(require("./evaluate-children"));
|
|
19
17
|
|
|
20
|
-
function
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
deck = _ref.deck,
|
|
29
|
-
ContextProvider = _ref.ContextProvider;
|
|
30
|
-
|
|
31
|
-
var _ref2 = deck || {},
|
|
32
|
-
viewManager = _ref2.viewManager;
|
|
18
|
+
function positionChildrenUnderViews({
|
|
19
|
+
children,
|
|
20
|
+
deck,
|
|
21
|
+
ContextProvider
|
|
22
|
+
}) {
|
|
23
|
+
const {
|
|
24
|
+
viewManager
|
|
25
|
+
} = deck || {};
|
|
33
26
|
|
|
34
27
|
if (!viewManager || !viewManager.views.length) {
|
|
35
28
|
return [];
|
|
36
29
|
}
|
|
37
30
|
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
const views = {};
|
|
32
|
+
const defaultViewId = viewManager.views[0].id;
|
|
40
33
|
|
|
41
|
-
|
|
42
|
-
|
|
34
|
+
for (const child of children) {
|
|
35
|
+
let viewId = defaultViewId;
|
|
36
|
+
let viewChildren = child;
|
|
43
37
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
var viewChildren = child;
|
|
38
|
+
if ((0, _inheritsFrom.inheritsFrom)(child.type, _core.View)) {
|
|
39
|
+
viewId = child.props.id || defaultViewId;
|
|
40
|
+
viewChildren = child.props.children;
|
|
41
|
+
}
|
|
49
42
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
43
|
+
const viewport = viewManager.getViewport(viewId);
|
|
44
|
+
const viewState = viewManager.getViewState(viewId);
|
|
45
|
+
|
|
46
|
+
if (viewport) {
|
|
47
|
+
const {
|
|
48
|
+
x,
|
|
49
|
+
y,
|
|
50
|
+
width,
|
|
51
|
+
height
|
|
52
|
+
} = viewport;
|
|
53
|
+
viewChildren = (0, _evaluateChildren.default)(viewChildren, {
|
|
54
|
+
x,
|
|
55
|
+
y,
|
|
56
|
+
width,
|
|
57
|
+
height,
|
|
58
|
+
viewport,
|
|
59
|
+
viewState
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
if (!views[viewId]) {
|
|
63
|
+
views[viewId] = {
|
|
64
|
+
viewport,
|
|
65
|
+
children: []
|
|
66
|
+
};
|
|
53
67
|
}
|
|
54
68
|
|
|
55
|
-
|
|
56
|
-
var viewState = viewManager.getViewState(viewId);
|
|
57
|
-
|
|
58
|
-
if (viewport) {
|
|
59
|
-
var x = viewport.x,
|
|
60
|
-
y = viewport.y,
|
|
61
|
-
width = viewport.width,
|
|
62
|
-
height = viewport.height;
|
|
63
|
-
viewChildren = (0, _evaluateChildren.default)(viewChildren, {
|
|
64
|
-
x: x,
|
|
65
|
-
y: y,
|
|
66
|
-
width: width,
|
|
67
|
-
height: height,
|
|
68
|
-
viewport: viewport,
|
|
69
|
-
viewState: viewState
|
|
70
|
-
});
|
|
71
|
-
|
|
72
|
-
if (!views[viewId]) {
|
|
73
|
-
views[viewId] = {
|
|
74
|
-
viewport: viewport,
|
|
75
|
-
children: []
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
views[viewId].children.push(viewChildren);
|
|
80
|
-
}
|
|
69
|
+
views[viewId].children.push(viewChildren);
|
|
81
70
|
}
|
|
82
|
-
} catch (err) {
|
|
83
|
-
_iterator.e(err);
|
|
84
|
-
} finally {
|
|
85
|
-
_iterator.f();
|
|
86
71
|
}
|
|
87
72
|
|
|
88
|
-
return Object.keys(views).map(
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
73
|
+
return Object.keys(views).map(viewId => {
|
|
74
|
+
const {
|
|
75
|
+
viewport,
|
|
76
|
+
children: viewChildren
|
|
77
|
+
} = views[viewId];
|
|
78
|
+
const {
|
|
79
|
+
x,
|
|
80
|
+
y,
|
|
81
|
+
width,
|
|
82
|
+
height
|
|
83
|
+
} = viewport;
|
|
84
|
+
const style = {
|
|
97
85
|
position: 'absolute',
|
|
98
86
|
left: x,
|
|
99
87
|
top: y,
|
|
100
|
-
width
|
|
101
|
-
height
|
|
88
|
+
width,
|
|
89
|
+
height
|
|
102
90
|
};
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
key: key,
|
|
91
|
+
const key = "view-".concat(viewId);
|
|
92
|
+
const viewElement = (0, _react.createElement)('div', {
|
|
93
|
+
key,
|
|
107
94
|
id: key,
|
|
108
|
-
style
|
|
109
|
-
}
|
|
95
|
+
style
|
|
96
|
+
}, ...viewChildren);
|
|
110
97
|
|
|
111
98
|
if (ContextProvider) {
|
|
112
|
-
|
|
113
|
-
viewport
|
|
99
|
+
const contextValue = {
|
|
100
|
+
viewport,
|
|
114
101
|
container: deck.canvas.offsetParent,
|
|
115
102
|
eventManager: deck.eventManager,
|
|
116
|
-
onViewStateChange:
|
|
103
|
+
onViewStateChange: params => {
|
|
117
104
|
params.viewId = viewId;
|
|
118
105
|
|
|
119
106
|
deck._onViewStateChange(params);
|
|
120
107
|
}
|
|
121
108
|
};
|
|
122
109
|
return (0, _react.createElement)(ContextProvider, {
|
|
123
|
-
key
|
|
110
|
+
key,
|
|
124
111
|
value: contextValue
|
|
125
112
|
}, viewElement);
|
|
126
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/utils/position-children-under-views.js"],"names":["positionChildrenUnderViews","children","deck","ContextProvider","viewManager","views","length","defaultViewId","id","child","viewId","viewChildren","type","View","props","viewport","getViewport","viewState","getViewState","x","y","width","height","push","Object","keys","map","style","position","left","top","key","viewElement","
|
|
1
|
+
{"version":3,"sources":["../../../src/utils/position-children-under-views.js"],"names":["positionChildrenUnderViews","children","deck","ContextProvider","viewManager","views","length","defaultViewId","id","child","viewId","viewChildren","type","View","props","viewport","getViewport","viewState","getViewState","x","y","width","height","push","Object","keys","map","style","position","left","top","key","viewElement","contextValue","container","canvas","offsetParent","eventManager","onViewStateChange","params","_onViewStateChange","value"],"mappings":"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","sourcesContent":["import {createElement} from 'react';\nimport {View} from '@deck.gl/core';\nimport {inheritsFrom} from './inherits-from';\nimport evaluateChildren from './evaluate-children';\n\n// Iterate over views and reposition children associated with views\n// TODO - Can we supply a similar function for the non-React case?\nexport default function positionChildrenUnderViews({children, deck, ContextProvider}) {\n const {viewManager} = deck || {};\n\n if (!viewManager || !viewManager.views.length) {\n return [];\n }\n\n const views = {};\n const defaultViewId = viewManager.views[0].id;\n\n // Sort children by view id\n for (const child of children) {\n // Unless child is a View, position / render as part of the default view\n let viewId = defaultViewId;\n let viewChildren = child;\n\n if (inheritsFrom(child.type, View)) {\n viewId = child.props.id || defaultViewId;\n viewChildren = child.props.children;\n }\n\n const viewport = viewManager.getViewport(viewId);\n const viewState = viewManager.getViewState(viewId);\n\n // Drop (auto-hide) elements with viewId that are not matched by any current view\n if (viewport) {\n const {x, y, width, height} = viewport;\n // Resolve potentially relative dimensions using the deck.gl container size\n viewChildren = evaluateChildren(viewChildren, {\n x,\n y,\n width,\n height,\n viewport,\n viewState\n });\n\n if (!views[viewId]) {\n views[viewId] = {\n viewport,\n children: []\n };\n }\n views[viewId].children.push(viewChildren);\n }\n }\n\n // Render views\n return Object.keys(views).map(viewId => {\n const {viewport, children: viewChildren} = views[viewId];\n const {x, y, width, height} = viewport;\n const style = {\n position: 'absolute',\n left: x,\n top: y,\n width,\n height\n };\n\n const key = `view-${viewId}`;\n // If children is passed as an array, React will throw the \"each element in a list needs\n // a key\" warning. Sending each child as separate arguments removes this requirement.\n const viewElement = createElement('div', {key, id: key, style}, ...viewChildren);\n\n if (ContextProvider) {\n const contextValue = {\n viewport,\n container: deck.canvas.offsetParent,\n eventManager: deck.eventManager,\n onViewStateChange: params => {\n params.viewId = viewId;\n deck._onViewStateChange(params);\n }\n };\n return createElement(ContextProvider, {key, value: contextValue}, viewElement);\n }\n\n return viewElement;\n });\n}\n"],"file":"position-children-under-views.js"}
|
|
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = require("react");
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? _react.useLayoutEffect : _react.useEffect;
|
|
11
11
|
var _default = useIsomorphicLayoutEffect;
|
|
12
12
|
exports.default = _default;
|
|
13
13
|
//# sourceMappingURL=use-isomorphic-layout-effect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/utils/use-isomorphic-layout-effect.js"],"names":["useIsomorphicLayoutEffect","window","useLayoutEffect","useEffect"],"mappings":";;;;;;;AAEA;;AAEA,
|
|
1
|
+
{"version":3,"sources":["../../../src/utils/use-isomorphic-layout-effect.js"],"names":["useIsomorphicLayoutEffect","window","useLayoutEffect","useEffect"],"mappings":";;;;;;;AAEA;;AAEA,MAAMA,yBAAyB,GAAG,OAAOC,MAAP,KAAkB,WAAlB,GAAgCC,sBAAhC,GAAkDC,gBAApF;eAEeH,yB","sourcesContent":["// From https://github.com/streamich/react-use/blob/master/src/useIsomorphicLayoutEffect.ts\n// useLayoutEffect but does not trigger warning in server-side rendering\nimport {useEffect, useLayoutEffect} from 'react';\n\nconst useIsomorphicLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect;\n\nexport default useIsomorphicLayoutEffect;\n"],"file":"use-isomorphic-layout-effect.js"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@deck.gl/react",
|
|
3
3
|
"description": "React Components for deck.gl",
|
|
4
4
|
"license": "MIT",
|
|
5
|
-
"version": "8.6.
|
|
5
|
+
"version": "8.6.4",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
8
8
|
},
|
|
@@ -32,5 +32,5 @@
|
|
|
32
32
|
"react": ">=16.3",
|
|
33
33
|
"react-dom": ">=16.3"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "750695c9f13595fa01982d81cdc2eb11bb5593b7"
|
|
36
36
|
}
|