Completely updated React, fixed #11, (hopefully)

goTorrentWebUI/node_modules/material-ui/es/Progress/CircularProgress.d.ts

@@ -1,30 +1,26 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface CircularProgressProps extends StandardProps<
-  React.HTMLAttributes<HTMLDivElement>,
-  CircularProgressClassKey
-> {
-  color?: 'primary' | 'accent' | 'inherit';
+export interface CircularProgressProps
+  extends StandardProps<React.HTMLAttributes<HTMLDivElement>, CircularProgressClassKey> {
+  color?: 'primary' | 'secondary' | 'inherit';
   max?: number;
   min?: number;
-  mode?: 'determinate' | 'indeterminate';
-  size?: number;
-  value?: number;
+  size?: number | string;
   thickness?: number;
+  value?: number;
+  variant?: 'determinate' | 'indeterminate' | 'static';
 }
 
 export type CircularProgressClassKey =
   | 'root'
-  | 'primaryColor'
-  | 'accentColor'
+  | 'colorPrimary'
+  | 'colorSecondary'
   | 'svg'
-  | 'indeterminateSvg'
+  | 'svgIndeterminate'
   | 'circle'
-  | 'indeterminateCircle'
-  | 'determinateCircle'
-  ;
+  | 'circleIndeterminate';
 
 declare const CircularProgress: React.ComponentType<CircularProgressProps>;
 
-export default CircularProgress
+export default CircularProgress;

goTorrentWebUI/node_modules/material-ui/es/Progress/CircularProgress.js

@@ -1,10 +1,10 @@
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
-
+import _extends from 'babel-runtime/helpers/extends';
+import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import withStyles from '../styles/withStyles';
+import { capitalize } from '../utils/helpers';
 
 const SIZE = 50;
 
@@ -13,22 +13,31 @@ function getRelativeValue(value, min, max) {
   return (clampedValue - min) / (max - min);
 }
 
+function easeOut(t) {
+  t = getRelativeValue(t, 0, 1);
+  // https://gist.github.com/gre/1650294
+  t = (t -= 1) * t * t + 1;
+  return t;
+}
+
+function easeIn(t) {
+  return t * t;
+}
+
 export const styles = theme => ({
   root: {
     display: 'inline-block'
   },
-  primaryColor: {
-    color: theme.palette.primary[500]
+  colorPrimary: {
+    color: theme.palette.primary.main
   },
-  accentColor: {
-    color: theme.palette.secondary.A200
+  colorSecondary: {
+    color: theme.palette.secondary.main
   },
+  svg: {},
   svgIndeterminate: {
     animation: 'mui-progress-circular-rotate 1.4s linear infinite'
   },
-  svgDeterminate: {
-    transform: 'rotate(-90deg)'
-  },
   circle: {
     stroke: 'currentColor',
     strokeLinecap: 'round'
@@ -36,8 +45,8 @@ export const styles = theme => ({
   circleIndeterminate: {
     animation: 'mui-progress-circular-dash 1.4s ease-in-out infinite',
     // Some default value that looks fine waiting for the animation to kicks in.
-    strokeDasharray: '80,200',
-    strokeDashoffset: 0
+    strokeDasharray: '80px, 200px',
+    strokeDashoffset: '0px' // Add the unit to fix a Edge 16 and below bug.
   },
   '@keyframes mui-progress-circular-rotate': {
     '100%': {
@@ -46,69 +55,82 @@ export const styles = theme => ({
   },
   '@keyframes mui-progress-circular-dash': {
     '0%': {
-      strokeDasharray: '1,200',
-      strokeDashoffset: 0
+      strokeDasharray: '1px, 200px',
+      strokeDashoffset: '0px'
     },
     '50%': {
-      strokeDasharray: '100,200',
-      strokeDashoffset: -15
+      strokeDasharray: '100px, 200px',
+      strokeDashoffset: '-15px'
     },
     '100%': {
-      strokeDasharray: '100,200',
-      strokeDashoffset: -120
+      strokeDasharray: '100px, 200px',
+      strokeDashoffset: '-120px'
     }
   }
 });
 
+/**
+ * ## ARIA
+ *
+ * If the progress bar is describing the loading progress of a particular region of a page,
+ * you should use `aria-describedby` to point to the progress bar, and set the `aria-busy`
+ * attribute to `true` on that region until it has finished loading.
+ */
 function CircularProgress(props) {
   const {
     classes,
     className,
     color,
+    max,
+    min,
     size,
     style,
     thickness,
-    mode,
     value,
-    min,
-    max
+    variant
   } = props,
-        other = _objectWithoutProperties(props, ['classes', 'className', 'color', 'size', 'style', 'thickness', 'mode', 'value', 'min', 'max']);
-
-  const rootProps = {};
+        other = _objectWithoutProperties(props, ['classes', 'className', 'color', 'max', 'min', 'size', 'style', 'thickness', 'value', 'variant']);
 
   const circleStyle = {};
-  if (mode === 'determinate') {
+  const rootStyle = {};
+  const rootProps = {};
+
+  if (variant === 'determinate' || variant === 'static') {
     const relVal = getRelativeValue(value, min, max) * 100;
     const circumference = 2 * Math.PI * (SIZE / 2 - 5);
+    circleStyle.strokeDasharray = circumference.toFixed(3);
+    rootProps['aria-valuenow'] = Math.round(relVal);
 
-    circleStyle.strokeDashoffset = `${Math.round((100 - relVal) / 100 * circumference * 1000) / 1000}px`;
-    circleStyle.strokeDasharray = Math.round(circumference * 1000) / 1000;
-
-    rootProps['aria-valuenow'] = value;
-    rootProps['aria-valuemin'] = min;
-    rootProps['aria-valuemax'] = max;
+    if (variant === 'static') {
+      circleStyle.strokeDashoffset = `${((100 - relVal) / 100 * circumference).toFixed(3)}px`;
+      rootStyle.transform = 'rotate(-90deg)';
+    } else {
+      circleStyle.strokeDashoffset = `${(easeIn((100 - relVal) / 100) * circumference).toFixed(3)}px`;
+      rootStyle.transform = `rotate(${(easeOut(relVal / 70) * 270).toFixed(3)}deg)`;
+    }
   }
 
   return React.createElement(
     'div',
     _extends({
-      className: classNames(classes.root, color !== 'inherit' && classes[`${color}Color`], className),
-      style: _extends({ width: size, height: size }, style),
+      className: classNames(classes.root, {
+        [classes[`color${capitalize(color)}`]]: color !== 'inherit'
+      }, className),
+      style: _extends({ width: size, height: size }, rootStyle, style),
       role: 'progressbar'
     }, rootProps, other),
     React.createElement(
       'svg',
       {
-        className: classNames({
-          [classes.svgIndeterminate]: mode === 'indeterminate',
-          [classes.svgDeterminate]: mode === 'determinate'
+        className: classNames(classes.svg, {
+          [classes.svgIndeterminate]: variant === 'indeterminate',
+          [classes.svgStatic]: variant === 'static'
         }),
         viewBox: `0 0 ${SIZE} ${SIZE}`
       },
       React.createElement('circle', {
         className: classNames(classes.circle, {
-          [classes.circleIndeterminate]: mode === 'indeterminate'
+          [classes.circleIndeterminate]: variant === 'indeterminate'
         }),
         style: circleStyle,
         cx: SIZE / 2,
@@ -121,14 +143,59 @@ function CircularProgress(props) {
   );
 }
 
+CircularProgress.propTypes = process.env.NODE_ENV !== "production" ? {
+  /**
+   * Useful to extend the style applied to components.
+   */
+  classes: PropTypes.object.isRequired,
+  /**
+   * @ignore
+   */
+  className: PropTypes.string,
+  /**
+   * The color of the component. It supports those theme colors that make sense for this component.
+   */
+  color: PropTypes.oneOf(['primary', 'secondary', 'inherit']),
+  /**
+   * The max value of progress in determinate variant.
+   */
+  max: PropTypes.number,
+  /**
+   * The min value of progress in determinate variant.
+   */
+  min: PropTypes.number,
+  /**
+   * The size of the circle.
+   */
+  size: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  /**
+   * @ignore
+   */
+  style: PropTypes.object,
+  /**
+   * The thickness of the circle.
+   */
+  thickness: PropTypes.number,
+  /**
+   * The value of the progress indicator for the determinate and static variants.
+   * Value between 0 and 100.
+   */
+  value: PropTypes.number,
+  /**
+   * The variant of progress indicator. Use indeterminate
+   * when there is no progress value.
+   */
+  variant: PropTypes.oneOf(['determinate', 'indeterminate', 'static'])
+} : {};
+
 CircularProgress.defaultProps = {
   color: 'primary',
+  max: 100,
+  min: 0,
   size: 40,
   thickness: 3.6,
-  mode: 'indeterminate',
   value: 0,
-  min: 0,
-  max: 100
+  variant: 'indeterminate'
 };
 
-export default withStyles(styles, { name: 'MuiCircularProgress' })(CircularProgress);
+export default withStyles(styles, { name: 'MuiCircularProgress', flip: false })(CircularProgress);

goTorrentWebUI/node_modules/material-ui/es/Progress/LinearProgress.d.ts

@@ -1,14 +1,12 @@
 import * as React from 'react';
 import { StandardProps } from '..';
 
-export interface LinearProgressProps extends StandardProps<
-  React.HTMLAttributes<HTMLDivElement>,
-  LinearProgressClassKey
-> {
-  color?: 'primary' | 'accent';
-  mode?: 'determinate' | 'indeterminate' | 'buffer' | 'query';
+export interface LinearProgressProps
+  extends StandardProps<React.HTMLAttributes<HTMLDivElement>, LinearProgressClassKey> {
+  color?: 'primary' | 'secondary';
   value?: number;
   valueBuffer?: number;
+  variant?: 'determinate' | 'indeterminate' | 'buffer' | 'query';
 }
 
 export type LinearProgressClassKey =
@@ -16,9 +14,9 @@ export type LinearProgressClassKey =
   | 'primaryColor'
   | 'primaryColorBar'
   | 'primaryDashed'
-  | 'accentColor'
-  | 'accentColorBar'
-  | 'accentDashed'
+  | 'secondaryColor'
+  | 'secondaryColorBar'
+  | 'secondaryDashed'
   | 'bar'
   | 'dashed'
   | 'bufferBar2'
@@ -27,10 +25,7 @@ export type LinearProgressClassKey =
   | 'indeterminateBar1'
   | 'indeterminateBar2'
   | 'determinateBar1'
-  | 'bufferBar1'
-  | 'bufferBar2Primary'
-  | 'bufferBar2Accent'
-  ;
+  | 'bufferBar1';
 
 declare const LinearProgress: React.ComponentType<LinearProgressProps>;
 

goTorrentWebUI/node_modules/material-ui/es/Progress/LinearProgress.js

@@ -1,11 +1,11 @@
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
-
+import _extends from 'babel-runtime/helpers/extends';
+import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import warning from 'warning';
 import withStyles from '../styles/withStyles';
+import { lighten } from '../styles/colorManipulator';
 
 const TRANSITION_DURATION = 4; // 400ms
 
@@ -16,24 +16,24 @@ export const styles = theme => ({
     height: 5
   },
   primaryColor: {
-    backgroundColor: theme.palette.primary[100]
+    backgroundColor: lighten(theme.palette.primary.light, 0.6)
   },
   primaryColorBar: {
-    backgroundColor: theme.palette.primary[500]
+    backgroundColor: theme.palette.primary.main
   },
   primaryDashed: {
-    background: `radial-gradient(${theme.palette.primary[100]} 0%, ${theme.palette.primary[100]} 16%, transparent 42%)`,
+    background: `radial-gradient(${lighten(theme.palette.primary.light, 0.6)} 0%, ${lighten(theme.palette.primary.light, 0.6)} 16%, transparent 42%)`,
     backgroundSize: '10px 10px',
     backgroundPosition: '0px -23px'
   },
-  accentColor: {
-    backgroundColor: theme.palette.secondary.A100
+  secondaryColor: {
+    backgroundColor: lighten(theme.palette.secondary.light, 0.4)
   },
-  accentColorBar: {
-    backgroundColor: theme.palette.secondary.A400
+  secondaryColorBar: {
+    backgroundColor: theme.palette.secondary.main
   },
-  accentDashed: {
-    background: `radial-gradient(${theme.palette.secondary.A100} 0%, ${theme.palette.secondary.A100} 16%, transparent 42%)`,
+  secondaryDashed: {
+    background: `radial-gradient(${lighten(theme.palette.secondary.light, 0.4)} 0%, ${lighten(theme.palette.secondary.light, 0.6)} 16%, transparent 42%)`,
     backgroundSize: '10px 10px',
     backgroundPosition: '0px -23px'
   },
@@ -81,14 +81,6 @@ export const styles = theme => ({
     zIndex: 1,
     transition: `transform .${TRANSITION_DURATION}s linear`
   },
-  bufferBar2Primary: {
-    transition: `transform .${TRANSITION_DURATION}s linear`,
-    backgroundColor: theme.palette.primary[100]
-  },
-  bufferBar2Accent: {
-    transition: `transform .${TRANSITION_DURATION}s linear`,
-    backgroundColor: theme.palette.secondary.A100
-  },
   // Legends:
   // || represents the viewport
   // -  represents a light background
@@ -141,67 +133,104 @@ export const styles = theme => ({
   }
 });
 
+/**
+ * ## ARIA
+ *
+ * If the progress bar is describing the loading progress of a particular region of a page,
+ * you should use `aria-describedby` to point to the progress bar, and set the `aria-busy`
+ * attribute to `true` on that region until it has finished loading.
+ */
 function LinearProgress(props) {
-  const { classes, className, color, mode, value, valueBuffer } = props,
-        other = _objectWithoutProperties(props, ['classes', 'className', 'color', 'mode', 'value', 'valueBuffer']);
+  const { classes, className, color, value, valueBuffer, variant } = props,
+        other = _objectWithoutProperties(props, ['classes', 'className', 'color', 'value', 'valueBuffer', 'variant']);
 
   const dashedClass = classNames(classes.dashed, {
     [classes.primaryDashed]: color === 'primary',
-    [classes.accentDashed]: color === 'accent'
+    [classes.secondaryDashed]: color === 'secondary'
   });
 
   const rootClassName = classNames(classes.root, {
     [classes.primaryColor]: color === 'primary',
-    [classes.accentColor]: color === 'accent',
-    [classes.rootBuffer]: mode === 'buffer',
-    [classes.rootQuery]: mode === 'query'
+    [classes.secondaryColor]: color === 'secondary',
+    [classes.rootBuffer]: variant === 'buffer',
+    [classes.rootQuery]: variant === 'query'
   }, className);
   const primaryClassName = classNames(classes.bar, {
     [classes.primaryColorBar]: color === 'primary',
-    [classes.accentColorBar]: color === 'accent',
-    [classes.indeterminateBar1]: mode === 'indeterminate' || mode === 'query',
-    [classes.determinateBar1]: mode === 'determinate',
-    [classes.bufferBar1]: mode === 'buffer'
+    [classes.secondaryColorBar]: color === 'secondary',
+    [classes.indeterminateBar1]: variant === 'indeterminate' || variant === 'query',
+    [classes.determinateBar1]: variant === 'determinate',
+    [classes.bufferBar1]: variant === 'buffer'
   });
   const secondaryClassName = classNames(classes.bar, {
-    [classes.bufferBar2]: mode === 'buffer',
-    [classes.primaryColorBar]: color === 'primary' && mode !== 'buffer',
-    [classes.primaryColor]: color === 'primary' && mode === 'buffer',
-    [classes.accentColorBar]: color === 'accent' && mode !== 'buffer',
-    [classes.accentColor]: color === 'accent' && mode === 'buffer',
-    [classes.indeterminateBar2]: mode === 'indeterminate' || mode === 'query'
+    [classes.bufferBar2]: variant === 'buffer',
+    [classes.primaryColorBar]: color === 'primary' && variant !== 'buffer',
+    [classes.primaryColor]: color === 'primary' && variant === 'buffer',
+    [classes.secondaryColorBar]: color === 'secondary' && variant !== 'buffer',
+    [classes.secondaryColor]: color === 'secondary' && variant === 'buffer',
+    [classes.indeterminateBar2]: variant === 'indeterminate' || variant === 'query'
   });
   const inlineStyles = { primary: {}, secondary: {} };
   const rootProps = {};
 
-  if (mode === 'determinate') {
+  if (variant === 'determinate' || variant === 'buffer') {
     if (value !== undefined) {
       inlineStyles.primary.transform = `scaleX(${value / 100})`;
       rootProps['aria-valuenow'] = Math.round(value);
     } else {
-      warning(false, 'Material-UI: you need to provide a value property ' + 'when LinearProgress is in determinate mode.');
+      process.env.NODE_ENV !== "production" ? warning(false, 'Material-UI: you need to provide a value property ' + 'when using the determinate or buffer variant of LinearProgress .') : void 0;
     }
-  } else if (mode === 'buffer') {
-    if (value !== undefined) {
-      inlineStyles.primary.transform = `scaleX(${value / 100})`;
+  }
+  if (variant === 'buffer') {
+    if (valueBuffer !== undefined) {
       inlineStyles.secondary.transform = `scaleX(${(valueBuffer || 0) / 100})`;
     } else {
-      warning(false, 'Material-UI: you need to provide a value property when LinearProgress is in buffer mode.');
+      process.env.NODE_ENV !== "production" ? warning(false, 'Material-UI: you need to provide a valueBuffer property ' + 'when using the buffer variant of LinearProgress.') : void 0;
     }
   }
 
   return React.createElement(
     'div',
-    _extends({ className: rootClassName }, rootProps, other),
-    mode === 'buffer' ? React.createElement('div', { className: dashedClass }) : null,
+    _extends({ className: rootClassName, role: 'progressbar' }, rootProps, other),
+    variant === 'buffer' ? React.createElement('div', { className: dashedClass }) : null,
     React.createElement('div', { className: primaryClassName, style: inlineStyles.primary }),
-    mode === 'determinate' ? null : React.createElement('div', { className: secondaryClassName, style: inlineStyles.secondary })
+    variant === 'determinate' ? null : React.createElement('div', { className: secondaryClassName, style: inlineStyles.secondary })
   );
 }
 
+LinearProgress.propTypes = process.env.NODE_ENV !== "production" ? {
+  /**
+   * Useful to extend the style applied to components.
+   */
+  classes: PropTypes.object.isRequired,
+  /**
+   * @ignore
+   */
+  className: PropTypes.string,
+  /**
+   * The color of the component. It supports those theme colors that make sense for this component.
+   */
+  color: PropTypes.oneOf(['primary', 'secondary']),
+  /**
+   * The value of the progress indicator for the determinate and buffer variants.
+   * Value between 0 and 100.
+   */
+  value: PropTypes.number,
+  /**
+   * The value for the buffer variant.
+   * Value between 0 and 100.
+   */
+  valueBuffer: PropTypes.number,
+  /**
+   * The variant of progress indicator. Use indeterminate or query
+   * when there is no progress value.
+   */
+  variant: PropTypes.oneOf(['determinate', 'indeterminate', 'buffer', 'query'])
+} : {};
+
 LinearProgress.defaultProps = {
   color: 'primary',
-  mode: 'indeterminate'
+  variant: 'indeterminate'
 };
 
 export default withStyles(styles, { name: 'MuiLinearProgress' })(LinearProgress);