13340

Committed 10 Sep 2019 - 3:13 coverage decreased (-2.6%) to 80.892%

Build # 13340

Build Type

Pull #3552

travis-ci-com

Committed by

web-flow

Commit Message

[#3548 - Part 4] Modify setup.py to specify that README is markdown

Pull Request Pull Request #3552: [#3548 - Part 4] Update notebook documentation to include additional pydeck features

Run Details

3330 of 4491 branches covered (74.15%)

Branch coverage included in aggregate %.

6860 of 8106 relevant lines covered (84.63%)

5923.39 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

95.52

/modules/react/src/utils/extract-jsx-layers.js

import React, {createElement} from 'react';
import {inheritsFrom} from './inherits-from';
import {Layer, View} from '@deck.gl/core';

// recursively wrap render callbacks in `View`
function wrapInView(node) {
  if (!node) {
    return node;
  }
  if (typeof node === 'function') {
    // React.Children does not traverse functions.
    // All render callbacks must be protected under a <View>
    return createElement(View, {}, node);
  }
  if (Array.isArray(node)) {
    return node.map(wrapInView);
  }
  if (inheritsFrom(node.type, View)) {
    return node;
  }
  return node;
}

// extracts any deck.gl layers masquerading as react elements from props.children
export default function extractJSXLayers({children, layers, views}) {
  const reactChildren = []; // extract real react elements (i.e. not deck.gl layers)
  const jsxLayers = []; // extracted layer from react children, will add to deck.gl layer array
  const jsxViews = {};

  // React.children
  React.Children.forEach(wrapInView(children), reactElement => {
    if (reactElement) {
      // For some reason Children.forEach doesn't filter out `null`s
      const ElementType = reactElement.type;
      if (inheritsFrom(ElementType, Layer)) {
        const layer = createLayer(ElementType, reactElement.props);
        jsxLayers.push(layer);
      } else {
        reactChildren.push(reactElement);
      }

      // empty id => default view
      if (ElementType !== View && inheritsFrom(ElementType, View) && reactElement.props.id) {
        const view = new ElementType(reactElement.props);
        jsxViews[view.id] = view;
      }
    }
  });

  // Avoid modifying views if no JSX views were found
  if (Object.keys(jsxViews).length > 0) {
    // If a view is specified in both views prop and JSX, use the one in views
    if (Array.isArray(views)) {
      views.forEach(view => {
        jsxViews[view.id] = view;
      });
    } else if (views) {
      jsxViews[views.id] = views;
    }
    views = Object.values(jsxViews);
  }

  // Avoid modifying layers array if no JSX layers were found
  layers = jsxLayers.length > 0 ? [...jsxLayers, ...layers] : layers;

  return {layers, children: reactChildren, views};
}

function createLayer(LayerType, reactProps) {
  const props = {};
  // Layer.defaultProps is treated as ReactElement.defaultProps and merged into react props
  // Remove them
  const defaultProps = LayerType.defaultProps || {};
  for (const key in reactProps) {
    if (defaultProps[key] !== reactProps[key]) {
      props[key] = reactProps[key];
    }
  }
  return new LayerType(props);
}

1	import React, {createElement} from 'react';	8×
2	import {inheritsFrom} from './inherits-from';
3	import {Layer, View} from '@deck.gl/core';
4
5	// recursively wrap render callbacks in `View`
6	function wrapInView(node) {
7	if (!node) {	21×
8	return node;	3×
9	}
10	if (typeof node === 'function') {	18×
11	// React.Children does not traverse functions.
12	// All render callbacks must be protected under a <View>
13	return createElement(View, {}, node);	3×
14	}
15	if (Array.isArray(node)) {	15×
16	return node.map(wrapInView);	4×
17	}
18	if (inheritsFrom(node.type, View)) {	11×
19	return node;	6×
20	}
21	return node;	5×
22	}
23
24	// extracts any deck.gl layers masquerading as react elements from props.children
25	export default function extractJSXLayers({children, layers, views}) {
26	const reactChildren = []; // extract real react elements (i.e. not deck.gl layers)	13×
27	const jsxLayers = []; // extracted layer from react children, will add to deck.gl layer array	13×
28	const jsxViews = {};	13×
29
30	// React.children
31	React.Children.forEach(wrapInView(children), reactElement => {	13×
32	if (reactElement) {	15×
33	// For some reason Children.forEach doesn't filter out `null`s
34	const ElementType = reactElement.type;	14×
35	if (inheritsFrom(ElementType, Layer)) {	14×
36	const layer = createLayer(ElementType, reactElement.props);	3×
37	jsxLayers.push(layer);	3×
38	} else {
39	reactChildren.push(reactElement);	11×
40	}
41
42	// empty id => default view
43	if (ElementType !== View && inheritsFrom(ElementType, View) && reactElement.props.id) {	14×
44	const view = new ElementType(reactElement.props);	5×
45	jsxViews[view.id] = view;	5×
46	}
47	}
48	});
49
50	// Avoid modifying views if no JSX views were found
51	if (Object.keys(jsxViews).length > 0) {	13×
52	// If a view is specified in both views prop and JSX, use the one in views
53	if (Array.isArray(views)) {	5×
54	views.forEach(view => {	1×
55	jsxViews[view.id] = view;	2×
56	});
57	} else if (views) {	4×
58	jsxViews[views.id] = views;	2×
59	}
60	views = Object.values(jsxViews);	5×
61	}
62
63	// Avoid modifying layers array if no JSX layers were found
64	layers = jsxLayers.length > 0 ? [...jsxLayers, ...layers] : layers;	13×
65
66	return {layers, children: reactChildren, views};	13×
67	}
68
69	function createLayer(LayerType, reactProps) {
70	const props = {};	3×
71	// Layer.defaultProps is treated as ReactElement.defaultProps and merged into react props
72	// Remove them
73	const defaultProps = LayerType.defaultProps \|\| {};	Branches [[12, 1]] missed. 3×
74	for (const key in reactProps) {	3×
75	if (defaultProps[key] !== reactProps[key]) {	Branches [[13, 0]] missed. 27×
UNCOV 76	props[key] = reactProps[key];	!
77	}
78	}
79	return new LayerType(props);	3×
80	}

uber / deck.gl / 13340

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous