@deck.gl/react 8.10.0-alpha.4 → 8.10.0-alpha.5

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.
@@ -159,7 +159,7 @@ const DeckGL = forwardRef((props, ref) => {
159
159
  style: canvasStyle
160
160
  });
161
161
  thisRef.control = createElement('div', {
162
- id: "".concat(id || 'deckgl', "-wrapper"),
162
+ id: `${id || 'deckgl'}-wrapper`,
163
163
  ref: containerRef,
164
164
  style: containerStyle
165
165
  }, [canvas, childrenUnderViews]);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/deckgl.ts"],"names":["createElement","useRef","useState","useMemo","useEffect","useImperativeHandle","forwardRef","Deck","useIsomorphicLayoutEffect","extractJSXLayers","positionChildrenUnderViews","extractStyles","getRefHandles","thisRef","deck","pickObject","opts","pickMultipleObjects","pickObjects","redrawDeck","redrawReason","_drawLayers","createDeckInstance","DeckClass","props","_customRender","viewports","getViewports","lastRenderedViewports","forceUpdate","DeckGL","ref","version","setVersion","_thisRef","control","v","current","containerRef","canvasRef","jsxProps","layers","views","children","inRender","handleViewStateChange","params","viewState","viewStateUpdateRequested","onViewStateChange","handleInteractionStateChange","interactionStateUpdateRequested","onInteractionStateChange","deckProps","forwardProps","style","width","height","parent","canvas","setProps","finalize","currentViewports","isInitialized","undefined","ContextProvider","id","containerStyle","canvasStyle","childrenUnderViews","key","defaultProps"],"mappings":"AAoBA,SACEA,aADF,EAEEC,MAFF,EAGEC,QAHF,EAIEC,OAJF,EAKEC,SALF,EAMEC,mBANF,EAOEC,UAPF,QAQO,OARP;AASA,SAAQC,IAAR,QAAmB,eAAnB;AACA,OAAOC,yBAAP,MAAsC,sCAAtC;AAEA,OAAOC,gBAAP,MAAqD,4BAArD;AACA,OAAOC,0BAAP,MAAuC,uCAAvC;AACA,OAAOC,aAAP,MAA0B,wBAA1B;;AAqCA,SAASC,aAAT,CAAuBC,OAAvB,EAA4D;AAC1D,SAAO;AACL,QAAIC,IAAJ,GAAW;AACT,aAAOD,OAAO,CAACC,IAAf;AACD,KAHI;;AAKLC,IAAAA,UAAU,EAAEC,IAAI,IAAIH,OAAO,CAACC,IAAR,CAAcC,UAAd,CAAyBC,IAAzB,CALf;AAMLC,IAAAA,mBAAmB,EAAED,IAAI,IAAIH,OAAO,CAACC,IAAR,CAAcG,mBAAd,CAAkCD,IAAlC,CANxB;AAOLE,IAAAA,WAAW,EAAEF,IAAI,IAAIH,OAAO,CAACC,IAAR,CAAcI,WAAd,CAA0BF,IAA1B;AAPhB,GAAP;AASD;;AAED,SAASG,UAAT,CAAoBN,OAApB,EAA8C;AAC5C,MAAIA,OAAO,CAACO,YAAZ,EAA0B;AAGxBP,IAAAA,OAAO,CAACC,IAAR,CAAaO,WAAb,CAAyBR,OAAO,CAACO,YAAjC;;AACAP,IAAAA,OAAO,CAACO,YAAR,GAAuB,IAAvB;AACD;AACF;;AAED,SAASE,kBAAT,CACET,OADF,EAEEU,SAFF,EAGEC,KAHF,EAIQ;AACN,QAAMV,IAAI,GAAG,IAAIS,SAAJ,CAAc,EACzB,GAAGC,KADsB;AAKzBC,IAAAA,aAAa,EAAEL,YAAY,IAAI;AAE7BP,MAAAA,OAAO,CAACO,YAAR,GAAuBA,YAAvB;AAIA,YAAMM,SAAS,GAAGZ,IAAI,CAACa,YAAL,EAAlB;;AACA,UAAId,OAAO,CAACe,qBAAR,KAAkCF,SAAtC,EAAiD;AAI/Cb,QAAAA,OAAO,CAACgB,WAAR;AACD,OALD,MAKO;AACLV,QAAAA,UAAU,CAACN,OAAD,CAAV;AACD;AACF;AApBwB,GAAd,CAAb;AAsBA,SAAOC,IAAP;AACD;;AAED,MAAMgB,MAAM,GAAGxB,UAAU,CAAyB,CAACkB,KAAD,EAAQO,GAAR,KAAgB;AAEhE,QAAM,CAACC,OAAD,EAAUC,UAAV,IAAwB/B,QAAQ,CAAC,CAAD,CAAtC;;AAEA,QAAMgC,QAAQ,GAAGjC,MAAM,CAAkB;AACvCkC,IAAAA,OAAO,EAAE,IAD8B;AAEvCH,IAAAA,OAFuC;AAGvCH,IAAAA,WAAW,EAAE,MAAMI,UAAU,CAACG,CAAC,IAAIA,CAAC,GAAG,CAAV;AAHU,GAAlB,CAAvB;;AAKA,QAAMvB,OAAO,GAAGqB,QAAQ,CAACG,OAAzB;AAEA,QAAMC,YAAY,GAAGrC,MAAM,CAAC,IAAD,CAA3B;AACA,QAAMsC,SAAS,GAAGtC,MAAM,CAAC,IAAD,CAAxB;AAGA,QAAMuC,QAAQ,GAAGrC,OAAO,CACtB,MAAMM,gBAAgB,CAACe,KAAD,CADA,EAEtB,CAACA,KAAK,CAACiB,MAAP,EAAejB,KAAK,CAACkB,KAArB,EAA4BlB,KAAK,CAACmB,QAAlC,CAFsB,CAAxB;AAMA,MAAIC,QAAQ,GAAG,IAAf;;AAEA,QAAMC,qBAAqD,GAAGC,MAAM,IAAI;AAAA;;AACtE,QAAIF,QAAQ,IAAIpB,KAAK,CAACuB,SAAtB,EAAiC;AAI/BlC,MAAAA,OAAO,CAACmC,wBAAR,GAAmCF,MAAnC;AACA,aAAO,IAAP;AACD;;AACDjC,IAAAA,OAAO,CAACmC,wBAAR,GAAmC,IAAnC;AACA,oCAAOxB,KAAK,CAACyB,iBAAb,0DAAO,2BAAAzB,KAAK,EAAqBsB,MAArB,CAAZ;AACD,GAVD;;AAYA,QAAMI,4BAAmE,GAAGJ,MAAM,IAAI;AACpF,QAAIF,QAAJ,EAAc;AAIZ/B,MAAAA,OAAO,CAACsC,+BAAR,GAA0CL,MAA1C;AACD,KALD,MAKO;AAAA;;AACLjC,MAAAA,OAAO,CAACsC,+BAAR,GAA0C,IAA1C;AACA,+BAAA3B,KAAK,CAAC4B,wBAAN,qFAAA5B,KAAK,EAA4BsB,MAA5B,CAAL;AACD;AACF,GAVD;;AAeA,QAAMO,SAAS,GAAGlD,OAAO,CAAC,MAAM;AAC9B,UAAMmD,YAAuB,GAAG,EAC9B,GAAG9B,KAD2B;AAG9B+B,MAAAA,KAAK,EAAE,IAHuB;AAI9BC,MAAAA,KAAK,EAAE,MAJuB;AAK9BC,MAAAA,MAAM,EAAE,MALsB;AAM9BC,MAAAA,MAAM,EAAEpB,YAAY,CAACD,OANS;AAO9BsB,MAAAA,MAAM,EAAEpB,SAAS,CAACF,OAPY;AAQ9BI,MAAAA,MAAM,EAAED,QAAQ,CAACC,MARa;AAS9BC,MAAAA,KAAK,EAAEF,QAAQ,CAACE,KATc;AAU9BO,MAAAA,iBAAiB,EAAEJ,qBAVW;AAW9BO,MAAAA,wBAAwB,EAAEF;AAXI,KAAhC;AAgBA,WAAOI,YAAY,CAAC7B,aAApB;;AAEA,QAAIZ,OAAO,CAACC,IAAZ,EAAkB;AAChBD,MAAAA,OAAO,CAACC,IAAR,CAAa8C,QAAb,CAAsBN,YAAtB;AACD;;AAED,WAAOA,YAAP;AACD,GAxBwB,EAwBtB,CAAC9B,KAAD,CAxBsB,CAAzB;AA0BApB,EAAAA,SAAS,CAAC,MAAM;AACd,UAAMmB,SAAS,GAAGC,KAAK,CAACjB,IAAN,IAAcA,IAAhC;AAEAM,IAAAA,OAAO,CAACC,IAAR,GAAeQ,kBAAkB,CAACT,OAAD,EAAUU,SAAV,EAAqB,EACpD,GAAG8B,SADiD;AAEpDK,MAAAA,MAAM,EAAEpB,YAAY,CAACD,OAF+B;AAGpDsB,MAAAA,MAAM,EAAEpB,SAAS,CAACF;AAHkC,KAArB,CAAjC;AAMA,WAAO;AAAA;;AAAA,8BAAMxB,OAAO,CAACC,IAAd,kDAAM,cAAc+C,QAAd,EAAN;AAAA,KAAP;AACD,GAVQ,EAUN,EAVM,CAAT;AAYArD,EAAAA,yBAAyB,CAAC,MAAM;AAI9BW,IAAAA,UAAU,CAACN,OAAD,CAAV;AAGA,UAAM;AAACmC,MAAAA,wBAAD;AAA2BG,MAAAA;AAA3B,QAA8DtC,OAApE;;AACA,QAAImC,wBAAJ,EAA8B;AAC5BH,MAAAA,qBAAqB,CAACG,wBAAD,CAArB;AACD;;AACD,QAAIG,+BAAJ,EAAqC;AACnCD,MAAAA,4BAA4B,CAACC,+BAAD,CAA5B;AACD;AACF,GAdwB,CAAzB;AAgBA9C,EAAAA,mBAAmB,CAAC0B,GAAD,EAAM,MAAMnB,aAAa,CAACC,OAAD,CAAzB,EAAoC,EAApC,CAAnB;AAEA,QAAMiD,gBAAgB,GACpBjD,OAAO,CAACC,IAAR,IAAgBD,OAAO,CAACC,IAAR,CAAaiD,aAA7B,GAA6ClD,OAAO,CAACC,IAAR,CAAaa,YAAb,EAA7C,GAA2EqC,SAD7E;AAGA,QAAM;AAACC,IAAAA,eAAD;AAAkBT,IAAAA,KAAlB;AAAyBC,IAAAA,MAAzB;AAAiCS,IAAAA,EAAjC;AAAqCX,IAAAA;AAArC,MAA8C/B,KAApD;AAEA,QAAM;AAAC2C,IAAAA,cAAD;AAAiBC,IAAAA;AAAjB,MAAgCjE,OAAO,CAC3C,MAAMQ,aAAa,CAAC;AAAC6C,IAAAA,KAAD;AAAQC,IAAAA,MAAR;AAAgBF,IAAAA;AAAhB,GAAD,CADwB,EAE3C,CAACC,KAAD,EAAQC,MAAR,EAAgBF,KAAhB,CAF2C,CAA7C;;AAWA,MACG,CAAC1C,OAAO,CAACmC,wBAAT,IAAqCnC,OAAO,CAACe,qBAAR,KAAkCkC,gBAAxE,IACAjD,OAAO,CAACmB,OAAR,KAAoBA,OAFtB,EAGE;AACAnB,IAAAA,OAAO,CAACe,qBAAR,GAAgCkC,gBAAhC;AACAjD,IAAAA,OAAO,CAACmB,OAAR,GAAkBA,OAAlB;AAIA,UAAMqC,kBAAkB,GAAG3D,0BAA0B,CAAC;AACpDiC,MAAAA,QAAQ,EAAEH,QAAQ,CAACG,QADiC;AAEpD7B,MAAAA,IAAI,EAAED,OAAO,CAACC,IAFsC;AAGpDmD,MAAAA;AAHoD,KAAD,CAArD;AAMA,UAAMN,MAAM,GAAG3D,aAAa,CAAC,QAAD,EAAW;AACrCsE,MAAAA,GAAG,EAAE,QADgC;AAErCJ,MAAAA,EAAE,EAAEA,EAAE,IAAI,gBAF2B;AAGrCnC,MAAAA,GAAG,EAAEQ,SAHgC;AAIrCgB,MAAAA,KAAK,EAAEa;AAJ8B,KAAX,CAA5B;AAQAvD,IAAAA,OAAO,CAACsB,OAAR,GAAkBnC,aAAa,CAC7B,KAD6B,EAE7B;AAACkE,MAAAA,EAAE,YAAKA,EAAE,IAAI,QAAX,aAAH;AAAkCnC,MAAAA,GAAG,EAAEO,YAAvC;AAAqDiB,MAAAA,KAAK,EAAEY;AAA5D,KAF6B,EAG7B,CAACR,MAAD,EAASU,kBAAT,CAH6B,CAA/B;AAKD;;AAEDzB,EAAAA,QAAQ,GAAG,KAAX;AACA,SAAO/B,OAAO,CAACsB,OAAf;AACD,CA1JwB,CAAzB;AA4JAL,MAAM,CAACyC,YAAP,GAAsBhE,IAAI,CAACgE,YAA3B;AAEA,eAAezC,MAAf","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.\nimport * as React from 'react';\nimport {\n createElement,\n useRef,\n useState,\n useMemo,\n useEffect,\n useImperativeHandle,\n forwardRef\n} from 'react';\nimport {Deck} from '@deck.gl/core';\nimport useIsomorphicLayoutEffect from './utils/use-isomorphic-layout-effect';\n\nimport extractJSXLayers, {DeckGLRenderCallback} from './utils/extract-jsx-layers';\nimport positionChildrenUnderViews from './utils/position-children-under-views';\nimport extractStyles from './utils/extract-styles';\n\nimport type {DeckGLContextValue} from './utils/position-children-under-views';\nimport type {DeckProps, Viewport} from '@deck.gl/core';\n\n/* eslint-disable max-statements, accessor-pairs */\ntype DeckInstanceRef = {\n deck?: Deck;\n redrawReason?: string | null;\n lastRenderedViewports?: Viewport[];\n viewStateUpdateRequested?: any;\n interactionStateUpdateRequested?: any;\n forceUpdate: () => void;\n version: number;\n control: React.ReactHTMLElement<HTMLElement> | null;\n};\n\n// Remove prop types in the base Deck class that support externally supplied canvas/WebGLContext\n/** DeckGL React component props */\nexport type DeckGLProps = Omit<\n DeckProps,\n 'width' | 'height' | 'gl' | 'parent' | 'canvas' | '_customRender'\n> & {\n Deck?: typeof Deck;\n width?: string | number;\n height?: string | number;\n children?: React.ReactNode | DeckGLRenderCallback;\n ContextProvider?: React.Context<DeckGLContextValue>['Provider'];\n};\n\nexport type DeckGLRef = {\n deck?: Deck;\n pickObject: Deck['pickObject'];\n pickObjects: Deck['pickObjects'];\n pickMultipleObjects: Deck['pickMultipleObjects'];\n};\n\nfunction getRefHandles(thisRef: DeckInstanceRef): DeckGLRef {\n return {\n get deck() {\n return thisRef.deck;\n },\n // The following method can only be called after ref is available, by which point deck is defined in useEffect\n pickObject: opts => thisRef.deck!.pickObject(opts),\n pickMultipleObjects: opts => thisRef.deck!.pickMultipleObjects(opts),\n pickObjects: opts => thisRef.deck!.pickObjects(opts)\n };\n}\n\nfunction redrawDeck(thisRef: DeckInstanceRef) {\n if (thisRef.redrawReason) {\n // Only redraw if we have received a dirty flag\n // @ts-expect-error accessing protected method\n thisRef.deck._drawLayers(thisRef.redrawReason);\n thisRef.redrawReason = null;\n }\n}\n\nfunction createDeckInstance(\n thisRef: DeckInstanceRef,\n DeckClass: typeof Deck,\n props: DeckProps\n): Deck {\n const deck = new DeckClass({\n ...props,\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.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();\n } else {\n redrawDeck(thisRef);\n }\n }\n });\n return deck;\n}\n\nconst DeckGL = forwardRef<DeckGLRef, DeckGLProps>((props, ref) => {\n // A mechanism to force redraw\n const [version, setVersion] = useState(0);\n // A reference to persistent states\n const _thisRef = useRef<DeckInstanceRef>({\n control: null,\n version,\n forceUpdate: () => setVersion(v => v + 1)\n });\n const thisRef = _thisRef.current;\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(\n () => extractJSXLayers(props),\n [props.layers, props.views, props.children]\n );\n\n // Callbacks\n let inRender = true;\n\n const handleViewStateChange: DeckProps['onViewStateChange'] = 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: DeckProps['onInteractionStateChange'] = 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 const forwardProps: DeckProps = {\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 parent: containerRef.current,\n canvas: canvasRef.current,\n layers: jsxProps.layers,\n views: jsxProps.views,\n onViewStateChange: handleViewStateChange,\n onInteractionStateChange: handleInteractionStateChange\n };\n\n // The defaultValue for _customRender is null, which would overwrite the definition\n // of _customRender. Remove to avoid frequently redeclaring the method here.\n delete forwardProps._customRender;\n\n if (thisRef.deck) {\n thisRef.deck.setProps(forwardProps);\n }\n\n return forwardProps;\n }, [props]);\n\n useEffect(() => {\n const DeckClass = props.Deck || Deck;\n\n thisRef.deck = createDeckInstance(thisRef, DeckClass, {\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 currentViewports =\n thisRef.deck && thisRef.deck.isInitialized ? thisRef.deck.getViewports() : undefined;\n\n const {ContextProvider, width, height, id, style} = props;\n\n const {containerStyle, canvasStyle} = useMemo(\n () => extractStyles({width, height, style}),\n [width, height, 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.defaultProps = Deck.defaultProps;\n\nexport default DeckGL;\n"],"file":"deckgl.js"}
1
+ {"version":3,"sources":["../../src/deckgl.ts"],"names":["createElement","useRef","useState","useMemo","useEffect","useImperativeHandle","forwardRef","Deck","useIsomorphicLayoutEffect","extractJSXLayers","positionChildrenUnderViews","extractStyles","getRefHandles","thisRef","deck","pickObject","opts","pickMultipleObjects","pickObjects","redrawDeck","redrawReason","_drawLayers","createDeckInstance","DeckClass","props","_customRender","viewports","getViewports","lastRenderedViewports","forceUpdate","DeckGL","ref","version","setVersion","_thisRef","control","v","current","containerRef","canvasRef","jsxProps","layers","views","children","inRender","handleViewStateChange","params","viewState","viewStateUpdateRequested","onViewStateChange","handleInteractionStateChange","interactionStateUpdateRequested","onInteractionStateChange","deckProps","forwardProps","style","width","height","parent","canvas","setProps","finalize","currentViewports","isInitialized","undefined","ContextProvider","id","containerStyle","canvasStyle","childrenUnderViews","key","defaultProps"],"mappings":"AAoBA,SACEA,aADF,EAEEC,MAFF,EAGEC,QAHF,EAIEC,OAJF,EAKEC,SALF,EAMEC,mBANF,EAOEC,UAPF,QAQO,OARP;AASA,SAAQC,IAAR,QAAmB,eAAnB;AACA,OAAOC,yBAAP,MAAsC,sCAAtC;AAEA,OAAOC,gBAAP,MAAqD,4BAArD;AACA,OAAOC,0BAAP,MAAuC,uCAAvC;AACA,OAAOC,aAAP,MAA0B,wBAA1B;;AAqCA,SAASC,aAAT,CAAuBC,OAAvB,EAA4D;AAC1D,SAAO;AACL,QAAIC,IAAJ,GAAW;AACT,aAAOD,OAAO,CAACC,IAAf;AACD,KAHI;;AAKLC,IAAAA,UAAU,EAAEC,IAAI,IAAIH,OAAO,CAACC,IAAR,CAAcC,UAAd,CAAyBC,IAAzB,CALf;AAMLC,IAAAA,mBAAmB,EAAED,IAAI,IAAIH,OAAO,CAACC,IAAR,CAAcG,mBAAd,CAAkCD,IAAlC,CANxB;AAOLE,IAAAA,WAAW,EAAEF,IAAI,IAAIH,OAAO,CAACC,IAAR,CAAcI,WAAd,CAA0BF,IAA1B;AAPhB,GAAP;AASD;;AAED,SAASG,UAAT,CAAoBN,OAApB,EAA8C;AAC5C,MAAIA,OAAO,CAACO,YAAZ,EAA0B;AAGxBP,IAAAA,OAAO,CAACC,IAAR,CAAaO,WAAb,CAAyBR,OAAO,CAACO,YAAjC;;AACAP,IAAAA,OAAO,CAACO,YAAR,GAAuB,IAAvB;AACD;AACF;;AAED,SAASE,kBAAT,CACET,OADF,EAEEU,SAFF,EAGEC,KAHF,EAIQ;AACN,QAAMV,IAAI,GAAG,IAAIS,SAAJ,CAAc,EACzB,GAAGC,KADsB;AAKzBC,IAAAA,aAAa,EAAEL,YAAY,IAAI;AAE7BP,MAAAA,OAAO,CAACO,YAAR,GAAuBA,YAAvB;AAIA,YAAMM,SAAS,GAAGZ,IAAI,CAACa,YAAL,EAAlB;;AACA,UAAId,OAAO,CAACe,qBAAR,KAAkCF,SAAtC,EAAiD;AAI/Cb,QAAAA,OAAO,CAACgB,WAAR;AACD,OALD,MAKO;AACLV,QAAAA,UAAU,CAACN,OAAD,CAAV;AACD;AACF;AApBwB,GAAd,CAAb;AAsBA,SAAOC,IAAP;AACD;;AAED,MAAMgB,MAAM,GAAGxB,UAAU,CAAyB,CAACkB,KAAD,EAAQO,GAAR,KAAgB;AAEhE,QAAM,CAACC,OAAD,EAAUC,UAAV,IAAwB/B,QAAQ,CAAC,CAAD,CAAtC;;AAEA,QAAMgC,QAAQ,GAAGjC,MAAM,CAAkB;AACvCkC,IAAAA,OAAO,EAAE,IAD8B;AAEvCH,IAAAA,OAFuC;AAGvCH,IAAAA,WAAW,EAAE,MAAMI,UAAU,CAACG,CAAC,IAAIA,CAAC,GAAG,CAAV;AAHU,GAAlB,CAAvB;;AAKA,QAAMvB,OAAO,GAAGqB,QAAQ,CAACG,OAAzB;AAEA,QAAMC,YAAY,GAAGrC,MAAM,CAAC,IAAD,CAA3B;AACA,QAAMsC,SAAS,GAAGtC,MAAM,CAAC,IAAD,CAAxB;AAGA,QAAMuC,QAAQ,GAAGrC,OAAO,CACtB,MAAMM,gBAAgB,CAACe,KAAD,CADA,EAEtB,CAACA,KAAK,CAACiB,MAAP,EAAejB,KAAK,CAACkB,KAArB,EAA4BlB,KAAK,CAACmB,QAAlC,CAFsB,CAAxB;AAMA,MAAIC,QAAQ,GAAG,IAAf;;AAEA,QAAMC,qBAAqD,GAAGC,MAAM,IAAI;AAAA;;AACtE,QAAIF,QAAQ,IAAIpB,KAAK,CAACuB,SAAtB,EAAiC;AAI/BlC,MAAAA,OAAO,CAACmC,wBAAR,GAAmCF,MAAnC;AACA,aAAO,IAAP;AACD;;AACDjC,IAAAA,OAAO,CAACmC,wBAAR,GAAmC,IAAnC;AACA,oCAAOxB,KAAK,CAACyB,iBAAb,0DAAO,2BAAAzB,KAAK,EAAqBsB,MAArB,CAAZ;AACD,GAVD;;AAYA,QAAMI,4BAAmE,GAAGJ,MAAM,IAAI;AACpF,QAAIF,QAAJ,EAAc;AAIZ/B,MAAAA,OAAO,CAACsC,+BAAR,GAA0CL,MAA1C;AACD,KALD,MAKO;AAAA;;AACLjC,MAAAA,OAAO,CAACsC,+BAAR,GAA0C,IAA1C;AACA,+BAAA3B,KAAK,CAAC4B,wBAAN,qFAAA5B,KAAK,EAA4BsB,MAA5B,CAAL;AACD;AACF,GAVD;;AAeA,QAAMO,SAAS,GAAGlD,OAAO,CAAC,MAAM;AAC9B,UAAMmD,YAAuB,GAAG,EAC9B,GAAG9B,KAD2B;AAG9B+B,MAAAA,KAAK,EAAE,IAHuB;AAI9BC,MAAAA,KAAK,EAAE,MAJuB;AAK9BC,MAAAA,MAAM,EAAE,MALsB;AAM9BC,MAAAA,MAAM,EAAEpB,YAAY,CAACD,OANS;AAO9BsB,MAAAA,MAAM,EAAEpB,SAAS,CAACF,OAPY;AAQ9BI,MAAAA,MAAM,EAAED,QAAQ,CAACC,MARa;AAS9BC,MAAAA,KAAK,EAAEF,QAAQ,CAACE,KATc;AAU9BO,MAAAA,iBAAiB,EAAEJ,qBAVW;AAW9BO,MAAAA,wBAAwB,EAAEF;AAXI,KAAhC;AAgBA,WAAOI,YAAY,CAAC7B,aAApB;;AAEA,QAAIZ,OAAO,CAACC,IAAZ,EAAkB;AAChBD,MAAAA,OAAO,CAACC,IAAR,CAAa8C,QAAb,CAAsBN,YAAtB;AACD;;AAED,WAAOA,YAAP;AACD,GAxBwB,EAwBtB,CAAC9B,KAAD,CAxBsB,CAAzB;AA0BApB,EAAAA,SAAS,CAAC,MAAM;AACd,UAAMmB,SAAS,GAAGC,KAAK,CAACjB,IAAN,IAAcA,IAAhC;AAEAM,IAAAA,OAAO,CAACC,IAAR,GAAeQ,kBAAkB,CAACT,OAAD,EAAUU,SAAV,EAAqB,EACpD,GAAG8B,SADiD;AAEpDK,MAAAA,MAAM,EAAEpB,YAAY,CAACD,OAF+B;AAGpDsB,MAAAA,MAAM,EAAEpB,SAAS,CAACF;AAHkC,KAArB,CAAjC;AAMA,WAAO;AAAA;;AAAA,8BAAMxB,OAAO,CAACC,IAAd,kDAAM,cAAc+C,QAAd,EAAN;AAAA,KAAP;AACD,GAVQ,EAUN,EAVM,CAAT;AAYArD,EAAAA,yBAAyB,CAAC,MAAM;AAI9BW,IAAAA,UAAU,CAACN,OAAD,CAAV;AAGA,UAAM;AAACmC,MAAAA,wBAAD;AAA2BG,MAAAA;AAA3B,QAA8DtC,OAApE;;AACA,QAAImC,wBAAJ,EAA8B;AAC5BH,MAAAA,qBAAqB,CAACG,wBAAD,CAArB;AACD;;AACD,QAAIG,+BAAJ,EAAqC;AACnCD,MAAAA,4BAA4B,CAACC,+BAAD,CAA5B;AACD;AACF,GAdwB,CAAzB;AAgBA9C,EAAAA,mBAAmB,CAAC0B,GAAD,EAAM,MAAMnB,aAAa,CAACC,OAAD,CAAzB,EAAoC,EAApC,CAAnB;AAEA,QAAMiD,gBAAgB,GACpBjD,OAAO,CAACC,IAAR,IAAgBD,OAAO,CAACC,IAAR,CAAaiD,aAA7B,GAA6ClD,OAAO,CAACC,IAAR,CAAaa,YAAb,EAA7C,GAA2EqC,SAD7E;AAGA,QAAM;AAACC,IAAAA,eAAD;AAAkBT,IAAAA,KAAlB;AAAyBC,IAAAA,MAAzB;AAAiCS,IAAAA,EAAjC;AAAqCX,IAAAA;AAArC,MAA8C/B,KAApD;AAEA,QAAM;AAAC2C,IAAAA,cAAD;AAAiBC,IAAAA;AAAjB,MAAgCjE,OAAO,CAC3C,MAAMQ,aAAa,CAAC;AAAC6C,IAAAA,KAAD;AAAQC,IAAAA,MAAR;AAAgBF,IAAAA;AAAhB,GAAD,CADwB,EAE3C,CAACC,KAAD,EAAQC,MAAR,EAAgBF,KAAhB,CAF2C,CAA7C;;AAWA,MACG,CAAC1C,OAAO,CAACmC,wBAAT,IAAqCnC,OAAO,CAACe,qBAAR,KAAkCkC,gBAAxE,IACAjD,OAAO,CAACmB,OAAR,KAAoBA,OAFtB,EAGE;AACAnB,IAAAA,OAAO,CAACe,qBAAR,GAAgCkC,gBAAhC;AACAjD,IAAAA,OAAO,CAACmB,OAAR,GAAkBA,OAAlB;AAIA,UAAMqC,kBAAkB,GAAG3D,0BAA0B,CAAC;AACpDiC,MAAAA,QAAQ,EAAEH,QAAQ,CAACG,QADiC;AAEpD7B,MAAAA,IAAI,EAAED,OAAO,CAACC,IAFsC;AAGpDmD,MAAAA;AAHoD,KAAD,CAArD;AAMA,UAAMN,MAAM,GAAG3D,aAAa,CAAC,QAAD,EAAW;AACrCsE,MAAAA,GAAG,EAAE,QADgC;AAErCJ,MAAAA,EAAE,EAAEA,EAAE,IAAI,gBAF2B;AAGrCnC,MAAAA,GAAG,EAAEQ,SAHgC;AAIrCgB,MAAAA,KAAK,EAAEa;AAJ8B,KAAX,CAA5B;AAQAvD,IAAAA,OAAO,CAACsB,OAAR,GAAkBnC,aAAa,CAC7B,KAD6B,EAE7B;AAACkE,MAAAA,EAAE,EAAG,GAAEA,EAAE,IAAI,QAAS,UAAvB;AAAkCnC,MAAAA,GAAG,EAAEO,YAAvC;AAAqDiB,MAAAA,KAAK,EAAEY;AAA5D,KAF6B,EAG7B,CAACR,MAAD,EAASU,kBAAT,CAH6B,CAA/B;AAKD;;AAEDzB,EAAAA,QAAQ,GAAG,KAAX;AACA,SAAO/B,OAAO,CAACsB,OAAf;AACD,CA1JwB,CAAzB;AA4JAL,MAAM,CAACyC,YAAP,GAAsBhE,IAAI,CAACgE,YAA3B;AAEA,eAAezC,MAAf","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.\nimport * as React from 'react';\nimport {\n createElement,\n useRef,\n useState,\n useMemo,\n useEffect,\n useImperativeHandle,\n forwardRef\n} from 'react';\nimport {Deck} from '@deck.gl/core';\nimport useIsomorphicLayoutEffect from './utils/use-isomorphic-layout-effect';\n\nimport extractJSXLayers, {DeckGLRenderCallback} from './utils/extract-jsx-layers';\nimport positionChildrenUnderViews from './utils/position-children-under-views';\nimport extractStyles from './utils/extract-styles';\n\nimport type {DeckGLContextValue} from './utils/position-children-under-views';\nimport type {DeckProps, Viewport} from '@deck.gl/core';\n\n/* eslint-disable max-statements, accessor-pairs */\ntype DeckInstanceRef = {\n deck?: Deck;\n redrawReason?: string | null;\n lastRenderedViewports?: Viewport[];\n viewStateUpdateRequested?: any;\n interactionStateUpdateRequested?: any;\n forceUpdate: () => void;\n version: number;\n control: React.ReactHTMLElement<HTMLElement> | null;\n};\n\n// Remove prop types in the base Deck class that support externally supplied canvas/WebGLContext\n/** DeckGL React component props */\nexport type DeckGLProps = Omit<\n DeckProps,\n 'width' | 'height' | 'gl' | 'parent' | 'canvas' | '_customRender'\n> & {\n Deck?: typeof Deck;\n width?: string | number;\n height?: string | number;\n children?: React.ReactNode | DeckGLRenderCallback;\n ContextProvider?: React.Context<DeckGLContextValue>['Provider'];\n};\n\nexport type DeckGLRef = {\n deck?: Deck;\n pickObject: Deck['pickObject'];\n pickObjects: Deck['pickObjects'];\n pickMultipleObjects: Deck['pickMultipleObjects'];\n};\n\nfunction getRefHandles(thisRef: DeckInstanceRef): DeckGLRef {\n return {\n get deck() {\n return thisRef.deck;\n },\n // The following method can only be called after ref is available, by which point deck is defined in useEffect\n pickObject: opts => thisRef.deck!.pickObject(opts),\n pickMultipleObjects: opts => thisRef.deck!.pickMultipleObjects(opts),\n pickObjects: opts => thisRef.deck!.pickObjects(opts)\n };\n}\n\nfunction redrawDeck(thisRef: DeckInstanceRef) {\n if (thisRef.redrawReason) {\n // Only redraw if we have received a dirty flag\n // @ts-expect-error accessing protected method\n thisRef.deck._drawLayers(thisRef.redrawReason);\n thisRef.redrawReason = null;\n }\n}\n\nfunction createDeckInstance(\n thisRef: DeckInstanceRef,\n DeckClass: typeof Deck,\n props: DeckProps\n): Deck {\n const deck = new DeckClass({\n ...props,\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.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();\n } else {\n redrawDeck(thisRef);\n }\n }\n });\n return deck;\n}\n\nconst DeckGL = forwardRef<DeckGLRef, DeckGLProps>((props, ref) => {\n // A mechanism to force redraw\n const [version, setVersion] = useState(0);\n // A reference to persistent states\n const _thisRef = useRef<DeckInstanceRef>({\n control: null,\n version,\n forceUpdate: () => setVersion(v => v + 1)\n });\n const thisRef = _thisRef.current;\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(\n () => extractJSXLayers(props),\n [props.layers, props.views, props.children]\n );\n\n // Callbacks\n let inRender = true;\n\n const handleViewStateChange: DeckProps['onViewStateChange'] = 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: DeckProps['onInteractionStateChange'] = 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 const forwardProps: DeckProps = {\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 parent: containerRef.current,\n canvas: canvasRef.current,\n layers: jsxProps.layers,\n views: jsxProps.views,\n onViewStateChange: handleViewStateChange,\n onInteractionStateChange: handleInteractionStateChange\n };\n\n // The defaultValue for _customRender is null, which would overwrite the definition\n // of _customRender. Remove to avoid frequently redeclaring the method here.\n delete forwardProps._customRender;\n\n if (thisRef.deck) {\n thisRef.deck.setProps(forwardProps);\n }\n\n return forwardProps;\n }, [props]);\n\n useEffect(() => {\n const DeckClass = props.Deck || Deck;\n\n thisRef.deck = createDeckInstance(thisRef, DeckClass, {\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 currentViewports =\n thisRef.deck && thisRef.deck.isInitialized ? thisRef.deck.getViewports() : undefined;\n\n const {ContextProvider, width, height, id, style} = props;\n\n const {containerStyle, canvasStyle} = useMemo(\n () => extractStyles({width, height, style}),\n [width, height, 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.defaultProps = Deck.defaultProps;\n\nexport default DeckGL;\n"],"file":"deckgl.js"}
@@ -76,7 +76,7 @@ export default function positionChildrenUnderViews({
76
76
  width,
77
77
  height
78
78
  };
79
- const key = "view-".concat(viewId);
79
+ const key = `view-${viewId}`;
80
80
  const viewElement = createElement('div', {
81
81
  key,
82
82
  id: key,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/utils/position-children-under-views.ts"],"names":["createElement","View","inheritsFrom","evaluateChildren","isComponent","positionChildrenUnderViews","children","deck","ContextProvider","viewManager","views","length","defaultViewId","id","child","viewId","viewChildren","type","props","viewport","getViewport","viewState","getViewState","padding","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 * as React from 'react';\nimport {createElement} from 'react';\nimport {View} from '@deck.gl/core';\nimport {inheritsFrom} from './inherits-from';\nimport evaluateChildren, {isComponent} from './evaluate-children';\n\nimport type {Deck, DeckProps, Viewport} from '@deck.gl/core';\nimport type {EventManager} from 'mjolnir.js';\n\nexport type DeckGLContextValue = {\n viewport: Viewport;\n container: HTMLElement;\n eventManager: EventManager;\n onViewStateChange: DeckProps['onViewStateChange'];\n};\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({\n children,\n deck,\n ContextProvider\n}: {\n children: React.ReactNode[];\n deck?: Deck;\n ContextProvider?: React.Context<DeckGLContextValue>['Provider'];\n}): React.ReactNode[] {\n // @ts-expect-error accessing protected property\n const {viewManager} = deck || {};\n\n if (!viewManager || !viewManager.views.length) {\n return [];\n }\n\n const views: Record<\n string,\n {\n viewport: Viewport;\n children: React.ReactNode[];\n }\n > = {};\n const defaultViewId = (viewManager.views[0] as View).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 (isComponent(child) && inheritsFrom(child.type, View)) {\n viewId = child.props.id || defaultViewId;\n viewChildren = child.props.children;\n }\n\n const viewport = viewManager.getViewport(viewId) as Viewport;\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 viewState.padding = viewport.padding;\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: DeckGLContextValue = {\n viewport,\n // @ts-expect-error accessing protected property\n container: deck.canvas.offsetParent,\n // @ts-expect-error accessing protected property\n eventManager: deck.eventManager,\n onViewStateChange: params => {\n params.viewId = viewId;\n // @ts-expect-error accessing protected method\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"}
1
+ {"version":3,"sources":["../../../src/utils/position-children-under-views.ts"],"names":["createElement","View","inheritsFrom","evaluateChildren","isComponent","positionChildrenUnderViews","children","deck","ContextProvider","viewManager","views","length","defaultViewId","id","child","viewId","viewChildren","type","props","viewport","getViewport","viewState","getViewState","padding","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 * as React from 'react';\nimport {createElement} from 'react';\nimport {View} from '@deck.gl/core';\nimport {inheritsFrom} from './inherits-from';\nimport evaluateChildren, {isComponent} from './evaluate-children';\n\nimport type {Deck, DeckProps, Viewport} from '@deck.gl/core';\nimport type {EventManager} from 'mjolnir.js';\n\nexport type DeckGLContextValue = {\n viewport: Viewport;\n container: HTMLElement;\n eventManager: EventManager;\n onViewStateChange: DeckProps['onViewStateChange'];\n};\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({\n children,\n deck,\n ContextProvider\n}: {\n children: React.ReactNode[];\n deck?: Deck;\n ContextProvider?: React.Context<DeckGLContextValue>['Provider'];\n}): React.ReactNode[] {\n // @ts-expect-error accessing protected property\n const {viewManager} = deck || {};\n\n if (!viewManager || !viewManager.views.length) {\n return [];\n }\n\n const views: Record<\n string,\n {\n viewport: Viewport;\n children: React.ReactNode[];\n }\n > = {};\n const defaultViewId = (viewManager.views[0] as View).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 (isComponent(child) && inheritsFrom(child.type, View)) {\n viewId = child.props.id || defaultViewId;\n viewChildren = child.props.children;\n }\n\n const viewport = viewManager.getViewport(viewId) as Viewport;\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 viewState.padding = viewport.padding;\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: DeckGLContextValue = {\n viewport,\n // @ts-expect-error accessing protected property\n container: deck.canvas.offsetParent,\n // @ts-expect-error accessing protected property\n eventManager: deck.eventManager,\n onViewStateChange: params => {\n params.viewId = viewId;\n // @ts-expect-error accessing protected method\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"}
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.10.0-alpha.4",
5
+ "version": "8.10.0-alpha.5",
6
6
  "publishConfig": {
7
7
  "access": "public"
8
8
  },
@@ -34,5 +34,5 @@
34
34
  "react": ">=16.3",
35
35
  "react-dom": ">=16.3"
36
36
  },
37
- "gitHead": "8195f543d7673ab0d6755f316c4ad516cff4f049"
37
+ "gitHead": "7fce975a84ff492e83bcd2206bedd9ccd4264f50"
38
38
  }