Use dash generate components (#67)

* Update styled-components, webpack, and babel-loader.

* Remove builder and use dash-generate-components.

* Add webpack config.

* Update bundle location and .eslintignore.

* Remove old build artefacts.

* Fix tests.

Change shallow mount to full mount; call render(); check props and not state of components.

* Split exponentials and regular digits for PrecisionInput test.

* Rename componentWillReceiveProps to UNSAFE_componentWillReceiveProps.

* Add default value for required precision prop in PrecisionInput.

* Comply with prop type for min in GraduatedBar test.

* Comply with prop type for secondary in Indicator component.

* Add jest-canvas-mock for Chrome colorpicker.

See: hustcc/jest-canvas-mock#2 (comment)

* Update requirements.

* Move jest-canvas-mock to dev dependencies.

* Update CHANGELOG.

* Update version in package.json.

* Add back build artifacts.

Author: Shammamah Hossain

.babelrc

@@ -1,3 +1,6 @@
 {
-    "extends": "./node_modules/dash-components-archetype/config/babel/babelrc"
+    "presets": [["@babel/preset-env", {
+        "useBuiltIns": "usage",
+        "corejs": 3
+        }], "@babel/preset-react"]
 }

.builderrc

@@ -2,11 +2,12 @@ build/
 coverage/
 dist/
 lib/
-lib/bundle.js*
+lib/*.js*
 node_modules/
 dash_daq/metadata.json
-dash_daq/bundle.js*
-inst/deps/bundle.js*
+dash_daq/*.js*
+inst/deps/*.js*
+webpack.config.js
 .npm
 vv/
 venv/

.eslintignore

@@ -6,6 +6,11 @@ The format is based on [Keep a
 Changelog](http://keepachangelog.com/en/1.0.0/) and this project
 adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.2.2] - 2019-10-04
+
+### Fixed
+* Fixed ThemeProvider warning by updating `styled-components` to `v4.4.0`.
+
 ## [0.2.1] - 2019-09-24
 
 ### Fixed

CHANGELOG.md

@@ -1,10 +1,10 @@
 Package: dashDaq
 Title: DAQ components for Dash
-Version: 0.1.5
+Version: 0.2.2
 Authors @R: as.person(c(The Plotly Team <[email protected]>))
 Description: DAQ components for Dash
 Depends: R (>= 3.0.2)
-Imports: dash
+Imports: 
 Suggests: 
 License: MIT + file LICENSE
 URL: https://github.com/plotly/dash-daq

DESCRIPTION

@@ -1,5 +1,5 @@
-include dash_daq/bundle.js
-include dash_daq/bundle.js.map
+include dash_daq/dash_daq.min.js
+include dash_daq/dash_daq.min.js.map
 include dash_daq/metadata.json
 include dash_daq/[email protected]
 include dash_daq/package-info.json

MANIFEST.in

@@ -17,5 +17,3 @@ export(daqStopButton)
 export(daqTank)
 export(daqThermometer)
 export(daqToggleSwitch)
-
-import(dash)

NAMESPACE

@@ -1,16 +1,16 @@
 # AUTO GENERATED FILE - DO NOT EDIT
 
-daqTank <- function(id=NULL, value=NULL, size=NULL, color=NULL, min=NULL, max=NULL, base=NULL, logarithmic=NULL, showCurrentValue=NULL, units=NULL, label=NULL, labelPosition=NULL, scale=NULL, className=NULL, style=NULL) {
+daqTank <- function(id=NULL, value=NULL, height=NULL, width=NULL, color=NULL, min=NULL, max=NULL, base=NULL, logarithmic=NULL, showCurrentValue=NULL, units=NULL, label=NULL, labelPosition=NULL, scale=NULL, className=NULL, style=NULL) {
 
-    props <- list(id=id, value=value, size=size, color=color, min=min, max=max, base=base, logarithmic=logarithmic, showCurrentValue=showCurrentValue, units=units, label=label, labelPosition=labelPosition, scale=scale, className=className, style=style)
+    props <- list(id=id, value=value, height=height, width=width, color=color, min=min, max=max, base=base, logarithmic=logarithmic, showCurrentValue=showCurrentValue, units=units, label=label, labelPosition=labelPosition, scale=scale, className=className, style=style)
     if (length(props) > 0) {
         props <- props[!vapply(props, is.null, logical(1))]
     }
     component <- list(
         props = props,
         type = 'Tank',
         namespace = 'dash_daq',
-        propNames = c('id', 'value', 'size', 'color', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'label', 'labelPosition', 'scale', 'className', 'style'),
+        propNames = c('id', 'value', 'height', 'width', 'color', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'label', 'labelPosition', 'scale', 'className', 'style'),
         package = 'dashDaq'
         )
 

R/daqTank.R

@@ -1,16 +1,16 @@
 # AUTO GENERATED FILE - DO NOT EDIT
 
-daqThermometer <- function(id=NULL, value=NULL, size=NULL, color=NULL, min=NULL, max=NULL, base=NULL, logarithmic=NULL, showCurrentValue=NULL, units=NULL, theme=NULL, label=NULL, labelPosition=NULL, scale=NULL, className=NULL, style=NULL) {
+daqThermometer <- function(id=NULL, value=NULL, height=NULL, width=NULL, color=NULL, min=NULL, max=NULL, base=NULL, logarithmic=NULL, showCurrentValue=NULL, units=NULL, theme=NULL, label=NULL, labelPosition=NULL, scale=NULL, className=NULL, style=NULL) {
 
-    props <- list(id=id, value=value, size=size, color=color, min=min, max=max, base=base, logarithmic=logarithmic, showCurrentValue=showCurrentValue, units=units, theme=theme, label=label, labelPosition=labelPosition, scale=scale, className=className, style=style)
+    props <- list(id=id, value=value, height=height, width=width, color=color, min=min, max=max, base=base, logarithmic=logarithmic, showCurrentValue=showCurrentValue, units=units, theme=theme, label=label, labelPosition=labelPosition, scale=scale, className=className, style=style)
     if (length(props) > 0) {
         props <- props[!vapply(props, is.null, logical(1))]
     }
     component <- list(
         props = props,
         type = 'Thermometer',
         namespace = 'dash_daq',
-        propNames = c('id', 'value', 'size', 'color', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'theme', 'label', 'labelPosition', 'scale', 'className', 'style'),
+        propNames = c('id', 'value', 'height', 'width', 'color', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'theme', 'label', 'labelPosition', 'scale', 'className', 'style'),
         package = 'dashDaq'
         )
 

R/daqThermometer.R

@@ -1,26 +1,9 @@
 .dashDaq_js_metadata <- function() {
 deps_metadata <- list(`dash_daq` = structure(list(name = "dash_daq",
-version = "0.1.5", src = list(href = NULL,
+version = "0.2.2", src = list(href = NULL,
 file = "deps"), meta = NULL,
-script = 'bundle.js',
+script = 'dash_daq.min.js',
 stylesheet = NULL, head = NULL, attachment = NULL, package = "dashDaq",
 all_files = FALSE), class = "html_dependency"))
 return(deps_metadata)
 }
-
-dash_assert_valid_wildcards <- function (attrib = list("data", "aria"), ...)
-{
-    args <- list(...)
-    validation_results <- lapply(names(args), function(x) {
-        grepl(paste0("^", attrib, "-[a-zA-Z0-9]{1,}$", collapse = "|"),
-            x)
-    })
-    if (FALSE %in% validation_results) {
-        stop(sprintf("The following wildcards are not currently valid in Dash: '%s'",
-            paste(names(args)[grepl(FALSE, unlist(validation_results))],
-                collapse = ", ")), call. = FALSE)
-    }
-    else {
-        return(args)
-    }
-}

R/internal.R

@@ -0,0 +1,45 @@
+# AUTO GENERATED FILE - DO NOT EDIT
+
+from dash.development.base_component import Component, _explicitize_args
+
+
+class BooleanSwitch(Component):
+    """A BooleanSwitch component.
+A switch component that toggles
+between on and off.
+
+Keyword arguments:
+- id (string; optional): The ID used to identify this compnent in Dash callbacks
+- on (boolean; default False): Whether or not the switch is on
+- color (string; optional): Color to highlight active switch background
+- vertical (boolean; default False): If true, switch will be vertical instead
+of horizontal
+- disabled (boolean; optional): If true, switch cannot be clicked
+- theme (dict; default light): Theme configuration to be set by a ThemeProvider
+- label (dict; optional): Description to be displayed alongside the control. To control styling,
+pass an object with label and style properties. label has the following type: string | dict containing keys 'style', 'label'.
+Those keys have the following types:
+  - style (dict; optional)
+  - label (string; optional)
+- labelPosition (a value equal to: 'top', 'bottom'; default 'top'): Where the component label is positioned.
+- className (string; optional): Class to apply to the root component element.
+- style (dict; optional): Style to apply to the root object."""
+    @_explicitize_args
+    def __init__(self, id=Component.UNDEFINED, on=Component.UNDEFINED, color=Component.UNDEFINED, vertical=Component.UNDEFINED, disabled=Component.UNDEFINED, theme=Component.UNDEFINED, label=Component.UNDEFINED, labelPosition=Component.UNDEFINED, className=Component.UNDEFINED, style=Component.UNDEFINED, **kwargs):
+        self._prop_names = ['id', 'on', 'color', 'vertical', 'disabled', 'theme', 'label', 'labelPosition', 'className', 'style']
+        self._type = 'BooleanSwitch'
+        self._namespace = 'dash_daq'
+        self._valid_wildcard_attributes =            []
+        self.available_properties = ['id', 'on', 'color', 'vertical', 'disabled', 'theme', 'label', 'labelPosition', 'className', 'style']
+        self.available_wildcard_properties =            []
+
+        _explicit_args = kwargs.pop('_explicit_args')
+        _locals = locals()
+        _locals.update(kwargs)  # For wildcard attrs
+        args = {k: _locals[k] for k in _explicit_args if k != 'children'}
+
+        for k in []:
+            if k not in args:
+                raise TypeError(
+                    'Required argument `' + k + '` was not specified.')
+        super(BooleanSwitch, self).__init__(**args)

dash_daq/BooleanSwitch.py

@@ -0,0 +1,50 @@
+# AUTO GENERATED FILE - DO NOT EDIT
+
+from dash.development.base_component import Component, _explicitize_args
+
+
+class ColorPicker(Component):
+    """A ColorPicker component.
+A color picker.
+
+Keyword arguments:
+- id (string; optional): The ID used to identify the color picker in Dash callbacks
+- value (dict; optional): Color value of the picker. value has the following type: dict containing keys 'hex', 'rbg'.
+Those keys have the following types:
+  - hex (string; optional): Hex string
+  - rbg (dict; optional): RGB/RGBA object. rbg has the following type: dict containing keys 'r', 'g', 'b', 'a'.
+Those keys have the following types:
+  - r (number; optional)
+  - g (number; optional)
+  - b (number; optional)
+  - a (number; optional)
+- disabled (boolean; optional): If true, color cannot be picked.
+- size (number; default 225): Size (width) of the component in pixels
+- theme (dict; default light): Theme configuration to be set by a ThemeProvider
+- label (dict; optional): Description to be displayed alongside the control. To control styling,
+pass an object with label and style properties. label has the following type: string | dict containing keys 'style', 'label'.
+Those keys have the following types:
+  - style (dict; optional)
+  - label (string; optional)
+- labelPosition (a value equal to: 'top', 'bottom'; default 'top'): Where the indicator label is positioned
+- className (string; optional): Class to apply to the root component element
+- style (dict; optional): Style to apply to the root component element"""
+    @_explicitize_args
+    def __init__(self, id=Component.UNDEFINED, value=Component.UNDEFINED, disabled=Component.UNDEFINED, size=Component.UNDEFINED, theme=Component.UNDEFINED, label=Component.UNDEFINED, labelPosition=Component.UNDEFINED, className=Component.UNDEFINED, style=Component.UNDEFINED, **kwargs):
+        self._prop_names = ['id', 'value', 'disabled', 'size', 'theme', 'label', 'labelPosition', 'className', 'style']
+        self._type = 'ColorPicker'
+        self._namespace = 'dash_daq'
+        self._valid_wildcard_attributes =            []
+        self.available_properties = ['id', 'value', 'disabled', 'size', 'theme', 'label', 'labelPosition', 'className', 'style']
+        self.available_wildcard_properties =            []
+
+        _explicit_args = kwargs.pop('_explicit_args')
+        _locals = locals()
+        _locals.update(kwargs)  # For wildcard attrs
+        args = {k: _locals[k] for k in _explicit_args if k != 'children'}
+
+        for k in []:
+            if k not in args:
+                raise TypeError(
+                    'Required argument `' + k + '` was not specified.')
+        super(ColorPicker, self).__init__(**args)

dash_daq/ColorPicker.py

@@ -0,0 +1,37 @@
+# AUTO GENERATED FILE - DO NOT EDIT
+
+from dash.development.base_component import Component, _explicitize_args
+
+
+class DarkThemeProvider(Component):
+    """A DarkThemeProvider component.
+DarkThemeProvider is a component that is placed at the root of
+the component tree to make all components match the dark theme
+
+Keyword arguments:
+- children (list of a list of or a singular dash component, string or numbers | a list of or a singular dash component, string or number; optional): The children of this component
+- theme (dict; optional): Theme object to override with a custom theme. theme has the following type: dict containing keys 'primary', 'secondary', 'detail', 'dark'.
+Those keys have the following types:
+  - primary (string; optional): Highlight color
+  - secondary (string; optional): Supporting color
+  - detail (string; optional): Color used for UI details, like borders
+  - dark (boolean; optional): True for Dark mode, false for Light"""
+    @_explicitize_args
+    def __init__(self, children=None, theme=Component.UNDEFINED, **kwargs):
+        self._prop_names = ['children', 'theme']
+        self._type = 'DarkThemeProvider'
+        self._namespace = 'dash_daq'
+        self._valid_wildcard_attributes =            []
+        self.available_properties = ['children', 'theme']
+        self.available_wildcard_properties =            []
+
+        _explicit_args = kwargs.pop('_explicit_args')
+        _locals = locals()
+        _locals.update(kwargs)  # For wildcard attrs
+        args = {k: _locals[k] for k in _explicit_args if k != 'children'}
+
+        for k in []:
+            if k not in args:
+                raise TypeError(
+                    'Required argument `' + k + '` was not specified.')
+        super(DarkThemeProvider, self).__init__(children=children, **args)

dash_daq/DarkThemeProvider.py

@@ -0,0 +1,81 @@
+# AUTO GENERATED FILE - DO NOT EDIT
+
+from dash.development.base_component import Component, _explicitize_args
+
+
+class Gauge(Component):
+    """A Gauge component.
+A Gauge component that points to
+a value between some range.
+
+Keyword arguments:
+- id (string; optional): The ID used to identify this compnent in Dash callbacks
+- value (number; optional): The value of gauge. If logarithmic, the displayed
+value will be the logarithm of the inputted value.
+- size (number; optional): The size (diameter) of the gauge in pixels
+- min (number; default 0): The minimum value of the gauge. If logarithmic,
+represents the minimum exponent.
+- max (number; default 10): The maximum value of the gauge. If logarithmic,
+represents the maximum exponent.
+- base (number; default 10): Base to be used in logarithmic scale.
+- logarithmic (boolean; optional): If set to true, a logarithmic scale will be
+used.
+- showCurrentValue (boolean; optional): If true, the current value of the gauge
+will be displayed
+- units (string; optional): Label for the current value
+- theme (dict; default light): Theme configuration to be set by a ThemeProvider
+- label (dict; optional): Description to be displayed alongside the control. To control styling, pass an object with label and style properties. label has the following type: string | dict containing keys 'style', 'label'.
+Those keys have the following types:
+  - style (dict; optional)
+  - label (string; optional)
+- labelPosition (a value equal to: 'top', 'bottom'; default 'top'): Where the component label is positioned.
+- scale (dict; optional): Configuration for the component scale. scale has the following type: dict containing keys 'start', 'interval', 'labelInterval', 'custom'.
+Those keys have the following types:
+  - start (number; optional): Value to start the scale from. Defaults
+to min.
+  - interval (number; optional): Interval by which the scale goes up. Attempts
+to dynamically divide min-max range by
+default.
+  - labelInterval (number; optional): Interval by which labels are added to
+scale marks. Defaults to 2 (every other
+mark has a label).
+  - custom (dict; optional): Custom scale marks. The key determines the position
+and the value determines what will show. If you want
+to set the style of a specific mark point, the value
+should be an object which contains style and label
+properties. custom has the following type: number | dict containing keys 'style', 'label'.
+Those keys have the following types:
+  - style (string; optional)
+  - label (string; optional)
+- color (dict; optional): Color configuration for the gauge's track. color has the following type: string | dict containing keys 'default', 'gradient', 'ranges'.
+Those keys have the following types:
+  - default (string; optional): Color used for current value text and other minor accents
+  - gradient (boolean; optional): Display ranges as a gradient between given colors.
+  - ranges (dict; optional): Define multiple color ranges on the gauge's track.
+The key determines the color of the range and
+the value is the start,end of the range itself.
+Ranges must be contiguous along the entirety
+of the gauge's range of values. ranges has the following type: dict containing keys 'color'.
+Those keys have the following types:
+  - color (list of numbers; optional)
+- className (string; optional): Class to apply to the root component element.
+- style (dict; optional): Style to apply to the root component element."""
+    @_explicitize_args
+    def __init__(self, id=Component.UNDEFINED, value=Component.UNDEFINED, size=Component.UNDEFINED, min=Component.UNDEFINED, max=Component.UNDEFINED, base=Component.UNDEFINED, logarithmic=Component.UNDEFINED, showCurrentValue=Component.UNDEFINED, units=Component.UNDEFINED, theme=Component.UNDEFINED, label=Component.UNDEFINED, labelPosition=Component.UNDEFINED, scale=Component.UNDEFINED, color=Component.UNDEFINED, className=Component.UNDEFINED, style=Component.UNDEFINED, **kwargs):
+        self._prop_names = ['id', 'value', 'size', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'theme', 'label', 'labelPosition', 'scale', 'color', 'className', 'style']
+        self._type = 'Gauge'
+        self._namespace = 'dash_daq'
+        self._valid_wildcard_attributes =            []
+        self.available_properties = ['id', 'value', 'size', 'min', 'max', 'base', 'logarithmic', 'showCurrentValue', 'units', 'theme', 'label', 'labelPosition', 'scale', 'color', 'className', 'style']
+        self.available_wildcard_properties =            []
+
+        _explicit_args = kwargs.pop('_explicit_args')
+        _locals = locals()
+        _locals.update(kwargs)  # For wildcard attrs
+        args = {k: _locals[k] for k in _explicit_args if k != 'children'}
+
+        for k in []:
+            if k not in args:
+                raise TypeError(
+                    'Required argument `' + k + '` was not specified.')
+        super(Gauge, self).__init__(**args)