@instructure/ui-progress 11.7.8 → 11.7.9-pr-snapshot-1792147648392

package/es/ProgressCircle/v1/theme.js

@@ -1,140 +1,100 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - present Instructure, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 const radius = {
-  xSmall: 1,
-  small: 1.8,
-  medium: 2.75,
-  large: 3.5
+    xSmall: 1,
+    small: 1.8,
+    medium: 2.75,
+    large: 3.5
 };
 const size = {
-  xSmall: 3,
-  small: 5,
-  medium: 7,
-  large: 9
+    xSmall: 3,
+    small: 5,
+    medium: 7,
+    large: 9
 };
 const strokeWidth = {
-  xSmall: 0.185,
-  small: 0.5,
-  medium: 0.625,
-  large: 0.875
+    xSmall: 0.185,
+    small: 0.5,
+    medium: 0.625,
+    large: 0.875
 };
-
-// Necessary to get the 1px border line to go "under" the meter
-// strokeWidth is divided in half because SVG strokeWidth is
-// centered along the path of the stroke, unlike CSS
 const borderWidth = 0.0625;
 const borderOffsetRadius = {
-  xSmall: radius.xSmall - strokeWidth.xSmall / 2 + borderWidth,
-  small: radius.small - strokeWidth.small / 2 + borderWidth,
-  medium: radius.medium - strokeWidth.medium / 2 + borderWidth,
-  large: radius.large - strokeWidth.large / 2 + borderWidth
+    xSmall: radius.xSmall - strokeWidth.xSmall / 2 + borderWidth,
+    small: radius.small - strokeWidth.small / 2 + borderWidth,
+    medium: radius.medium - strokeWidth.medium / 2 + borderWidth,
+    large: radius.large - strokeWidth.large / 2 + borderWidth
 };
-const circumference = function (r) {
-  return (2 * Math.PI * r).toFixed(3);
+const circumference = function(r) {
+    return (2 * Math.PI * r).toFixed(3);
 };
-const transform = function (s) {
-  return s / 2;
+const transform = function(s) {
+    return s / 2;
 };
-
-/**
- * Generates the theme object for the component from the theme and provided additional information
- * @param  {Object} theme The actual theme object.
- * @return {Object} The final theme object with the overrides and component variables
- */
-const generateComponentTheme = theme => {
-  const {
-    colors,
-    typography,
-    key: themeName
-  } = theme;
-  const themeSpecificStyle = {
-    canvas: {
-      color: theme['ic-brand-font-color-dark'],
-      meterColorBrand: theme['ic-brand-primary']
-    },
-    'canvas-high-contrast': {
-      meterColorBrandInverse: colors?.contrasts?.white1010,
-      meterColorSuccessInverse: colors?.contrasts?.white1010,
-      meterColorInfoInverse: colors?.contrasts?.white1010,
-      meterColorAlertInverse: colors?.contrasts?.white1010,
-      meterColorWarningInverse: colors?.contrasts?.white1010,
-      meterColorDangerInverse: colors?.contrasts?.white1010
-    }
-  };
-  const componentVariables = {
-    fontFamily: typography?.fontFamily,
-    fontWeight: typography?.fontWeightNormal,
-    lineHeight: typography?.lineHeightCondensed,
-    xSmallSize: `${size.xSmall}em`,
-    xSmallRadius: `${radius.xSmall}em`,
-    xSmallCircumference: `${circumference(radius.xSmall)}em`,
-    xSmallTransform: `${transform(size.xSmall)}em`,
-    xSmallStrokeWidth: `${strokeWidth.xSmall}em`,
-    xSmallBorderOffset: `${borderOffsetRadius.xSmall}em`,
-    smallSize: `${size.small}em`,
-    smallRadius: `${radius.small}em`,
-    smallCircumference: `${circumference(radius.small)}em`,
-    smallTransform: `${transform(size.small)}em`,
-    smallStrokeWidth: `${strokeWidth.small}em`,
-    smallBorderOffset: `${borderOffsetRadius.small}em`,
-    mediumSize: `${size.medium}em`,
-    mediumRadius: `${radius.medium}em`,
-    mediumCircumference: `${circumference(radius.medium)}em`,
-    mediumTransform: `${transform(size.medium)}em`,
-    mediumStrokeWidth: `${strokeWidth.medium}em`,
-    mediumBorderOffset: `${borderOffsetRadius.medium}em`,
-    largeSize: `${size.large}em`,
-    largeRadius: `${radius.large}em`,
-    largeCircumference: `${circumference(radius.large)}em`,
-    largeTransform: `${transform(size.large)}em`,
-    largeStrokeWidth: `${strokeWidth.large}em`,
-    largeBorderOffset: `${borderOffsetRadius.large}em`,
-    color: colors?.contrasts?.grey125125,
-    colorInverse: colors?.contrasts?.white1010,
-    trackColor: colors?.contrasts?.white1010,
-    trackColorInverse: 'transparent',
-    trackBorderColor: colors?.contrasts?.grey3045,
-    trackBorderColorInverse: colors?.contrasts?.white1010,
-    // variables are split out for inverse to allow
-    // color value changes for inverse-high-contrast
-    meterColorBrand: colors?.contrasts?.blue4570,
-    meterColorBrandInverse: colors?.contrasts?.blue4570,
-    meterColorInfo: colors?.contrasts?.blue4570,
-    meterColorInfoInverse: colors?.contrasts?.blue4570,
-    meterColorSuccess: colors?.contrasts?.green4570,
-    meterColorSuccessInverse: colors?.contrasts?.green4570,
-    meterColorDanger: colors?.contrasts?.red4570,
-    meterColorDangerInverse: colors?.contrasts?.red4570,
-    meterColorAlert: colors?.contrasts?.blue4570,
-    meterColorAlertInverse: colors?.contrasts?.blue4570,
-    meterColorWarning: colors?.contrasts?.orange4570,
-    meterColorWarningInverse: colors?.contrasts?.orange4570
-  };
-  return {
-    ...componentVariables,
-    ...themeSpecificStyle[themeName]
-  };
+const generateComponentTheme = (theme)=>{
+    const { colors, typography, key: themeName } = theme;
+    const themeSpecificStyle = {
+        canvas: {
+            color: theme['ic-brand-font-color-dark'],
+            meterColorBrand: theme['ic-brand-primary']
+        },
+        'canvas-high-contrast': {
+            meterColorBrandInverse: colors?.contrasts?.white1010,
+            meterColorSuccessInverse: colors?.contrasts?.white1010,
+            meterColorInfoInverse: colors?.contrasts?.white1010,
+            meterColorAlertInverse: colors?.contrasts?.white1010,
+            meterColorWarningInverse: colors?.contrasts?.white1010,
+            meterColorDangerInverse: colors?.contrasts?.white1010
+        }
+    };
+    const componentVariables = {
+        fontFamily: typography?.fontFamily,
+        fontWeight: typography?.fontWeightNormal,
+        lineHeight: typography?.lineHeightCondensed,
+        xSmallSize: `${size.xSmall}em`,
+        xSmallRadius: `${radius.xSmall}em`,
+        xSmallCircumference: `${circumference(radius.xSmall)}em`,
+        xSmallTransform: `${transform(size.xSmall)}em`,
+        xSmallStrokeWidth: `${strokeWidth.xSmall}em`,
+        xSmallBorderOffset: `${borderOffsetRadius.xSmall}em`,
+        smallSize: `${size.small}em`,
+        smallRadius: `${radius.small}em`,
+        smallCircumference: `${circumference(radius.small)}em`,
+        smallTransform: `${transform(size.small)}em`,
+        smallStrokeWidth: `${strokeWidth.small}em`,
+        smallBorderOffset: `${borderOffsetRadius.small}em`,
+        mediumSize: `${size.medium}em`,
+        mediumRadius: `${radius.medium}em`,
+        mediumCircumference: `${circumference(radius.medium)}em`,
+        mediumTransform: `${transform(size.medium)}em`,
+        mediumStrokeWidth: `${strokeWidth.medium}em`,
+        mediumBorderOffset: `${borderOffsetRadius.medium}em`,
+        largeSize: `${size.large}em`,
+        largeRadius: `${radius.large}em`,
+        largeCircumference: `${circumference(radius.large)}em`,
+        largeTransform: `${transform(size.large)}em`,
+        largeStrokeWidth: `${strokeWidth.large}em`,
+        largeBorderOffset: `${borderOffsetRadius.large}em`,
+        color: colors?.contrasts?.grey125125,
+        colorInverse: colors?.contrasts?.white1010,
+        trackColor: colors?.contrasts?.white1010,
+        trackColorInverse: 'transparent',
+        trackBorderColor: colors?.contrasts?.grey3045,
+        trackBorderColorInverse: colors?.contrasts?.white1010,
+        meterColorBrand: colors?.contrasts?.blue4570,
+        meterColorBrandInverse: colors?.contrasts?.blue4570,
+        meterColorInfo: colors?.contrasts?.blue4570,
+        meterColorInfoInverse: colors?.contrasts?.blue4570,
+        meterColorSuccess: colors?.contrasts?.green4570,
+        meterColorSuccessInverse: colors?.contrasts?.green4570,
+        meterColorDanger: colors?.contrasts?.red4570,
+        meterColorDangerInverse: colors?.contrasts?.red4570,
+        meterColorAlert: colors?.contrasts?.blue4570,
+        meterColorAlertInverse: colors?.contrasts?.blue4570,
+        meterColorWarning: colors?.contrasts?.orange4570,
+        meterColorWarningInverse: colors?.contrasts?.orange4570
+    };
+    return {
+        ...componentVariables,
+        ...themeSpecificStyle[themeName]
+    };
 };
-export default generateComponentTheme;
+export default generateComponentTheme;

package/es/ProgressCircle/v2/index.js

@@ -1,28 +1,5 @@
-var _dec, _class;
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - present Instructure, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
+import { _ as _ts_decorate } from "@swc/helpers/_/_ts_decorate";
+import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { Component } from 'react';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { View } from '@instructure/ui-view/latest';
@@ -30,147 +7,133 @@ import { callRenderProp, passthroughProps } from '@instructure/ui-react-utils';
 import { withStyleNew } from '@instructure/emotion';
 import generateStyle from './styles.js';
 import { allowedProps } from './props.js';
-
-/**
----
-category: components
----
-**/
-import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-let ProgressCircle = (_dec = withStyleNew(generateStyle), _dec(_class = class ProgressCircle extends Component {
-  static displayName = 'ProgressCircle';
-  static componentId = 'ProgressCircle';
-  static allowedProps = allowedProps;
-  static defaultProps = {
-    formatScreenReaderValue: ({
-      valueNow,
-      valueMax
-    }) => `${valueNow} / ${valueMax}`,
-    size: 'medium',
-    valueMax: 100,
-    valueNow: 0,
-    as: 'div',
-    color: 'primary',
-    shouldAnimateOnMount: false,
-    // default to showing `success` color on completion
-    meterColor: ({
-      valueNow,
-      valueMax
-    }) => valueNow / valueMax >= 1 ? 'success' : 'brand'
-  };
-  _timeouts = [];
-  ref = null;
-  constructor(props) {
-    super(props);
-    this.state = {
-      shouldAnimateOnMount: props.shouldAnimateOnMount
-    };
-  }
-  handleRef = el => {
-    const {
-      elementRef
-    } = this.props;
-    this.ref = el;
-    if (typeof elementRef === 'function') {
-      elementRef(el);
+class ProgressCircle extends Component {
+    static{
+        this.displayName = 'ProgressCircle';
+    }
+    static{
+        this.componentId = 'ProgressCircle';
+    }
+    static{
+        this.allowedProps = allowedProps;
+    }
+    static{
+        this.defaultProps = {
+            formatScreenReaderValue: ({ valueNow, valueMax })=>`${valueNow} / ${valueMax}`,
+            size: 'medium',
+            valueMax: 100,
+            valueNow: 0,
+            as: 'div',
+            color: 'primary',
+            shouldAnimateOnMount: false,
+            meterColor: ({ valueNow, valueMax })=>valueNow / valueMax >= 1 ? 'success' : 'brand'
+        };
+    }
+    constructor(props){
+        super(props), this._timeouts = [], this.ref = null, this.handleRef = (el)=>{
+            const { elementRef } = this.props;
+            this.ref = el;
+            if (typeof elementRef === 'function') {
+                elementRef(el);
+            }
+        };
+        this.state = {
+            shouldAnimateOnMount: props.shouldAnimateOnMount
+        };
     }
-  };
-  get makeStylesVariables() {
-    return {
-      shouldAnimateOnMount: this.state.shouldAnimateOnMount
-    };
-  }
-  componentDidMount() {
-    if (this.state.shouldAnimateOnMount) {
-      this._timeouts.push(setTimeout(() => {
-        this.setState({
-          shouldAnimateOnMount: false
+    get makeStylesVariables() {
+        return {
+            shouldAnimateOnMount: this.state.shouldAnimateOnMount
+        };
+    }
+    componentDidMount() {
+        if (this.state.shouldAnimateOnMount) {
+            this._timeouts.push(setTimeout(()=>{
+                this.setState({
+                    shouldAnimateOnMount: false
+                });
+            }, this.props.animationDelay || 500));
+        }
+        this.props.makeStyles?.(this.makeStylesVariables);
+    }
+    componentDidUpdate() {
+        this.props.makeStyles?.(this.makeStylesVariables);
+    }
+    componentWillUnmount() {
+        this._timeouts.forEach((timeout)=>clearTimeout(timeout));
+    }
+    render() {
+        const { color, renderValue, formatScreenReaderValue, meterColor, valueNow, valueMax, screenReaderLabel, size, styles, ...props } = this.props;
+        const valueText = typeof formatScreenReaderValue === 'function' ? formatScreenReaderValue({
+            valueNow: valueNow,
+            valueMax: valueMax
+        }) : undefined;
+        const labelAndValueText = `${screenReaderLabel} ${valueText}`;
+        const value = callRenderProp(renderValue, {
+            valueNow: valueNow,
+            valueMax: valueMax
+        });
+        const style = {
+            strokeDashoffset: `${styles?.dashOffset}em`
+        };
+        return /*#__PURE__*/ _jsxs(View, {
+            ...passthroughProps(props),
+            as: this.props.as,
+            elementRef: this.handleRef,
+            css: styles?.progressCircle,
+            margin: this.props.margin,
+            "data-cid": "ProgressCircle",
+            children: [
+                /*#__PURE__*/ _jsx(ScreenReaderContent, {
+                    children: /*#__PURE__*/ _jsx("progress", {
+                        max: valueMax,
+                        value: valueNow,
+                        "aria-valuetext": labelAndValueText
+                    })
+                }),
+                value && /*#__PURE__*/ _jsx("span", {
+                    css: styles?.center,
+                    "aria-hidden": "true",
+                    children: /*#__PURE__*/ _jsx("span", {
+                        css: styles?.value,
+                        children: value
+                    })
+                }),
+                /*#__PURE__*/ _jsxs("svg", {
+                    css: styles?.circle,
+                    role: "presentation",
+                    focusable: "false",
+                    children: [
+                        /*#__PURE__*/ _jsx("circle", {
+                            css: styles?.track,
+                            role: "presentation",
+                            cx: "50%",
+                            cy: "50%",
+                            r: styles?.radii?.radius
+                        }),
+                        /*#__PURE__*/ _jsx("circle", {
+                            css: styles?.border,
+                            role: "presentation",
+                            cx: "50%",
+                            cy: "50%",
+                            r: styles?.radii?.borderOffsetRadius
+                        }),
+                        /*#__PURE__*/ _jsx("circle", {
+                            css: styles?.meter,
+                            role: "presentation",
+                            style: style,
+                            cx: "50%",
+                            cy: "50%",
+                            r: styles?.radii?.radius
+                        })
+                    ]
+                })
+            ]
         });
-      }, this.props.animationDelay || 500));
     }
-    this.props.makeStyles?.(this.makeStylesVariables);
-  }
-  componentDidUpdate() {
-    this.props.makeStyles?.(this.makeStylesVariables);
-  }
-  componentWillUnmount() {
-    this._timeouts.forEach(timeout => clearTimeout(timeout));
-  }
-  render() {
-    const {
-      color,
-      renderValue,
-      formatScreenReaderValue,
-      meterColor,
-      valueNow,
-      valueMax,
-      screenReaderLabel,
-      size,
-      styles,
-      ...props
-    } = this.props;
-    const valueText = typeof formatScreenReaderValue === 'function' ? formatScreenReaderValue({
-      valueNow: valueNow,
-      valueMax: valueMax
-    }) : undefined;
-    // consolidating the label and aria-valuetext to put in aria-label because
-    // NVDA does not read aria-valuetext: https://github.com/nvaccess/nvda/issues/913
-    // But leaving aria-valuetext because JAWS ignores aria-label
-    const labelAndValueText = `${screenReaderLabel} ${valueText}`;
-    const value = callRenderProp(renderValue, {
-      valueNow: valueNow,
-      valueMax: valueMax
-    });
-    const style = {
-      strokeDashoffset: `${styles?.dashOffset}em`
-    };
-    return _jsxs(View, {
-      ...passthroughProps(props),
-      as: this.props.as,
-      elementRef: this.handleRef,
-      css: styles?.progressCircle,
-      margin: this.props.margin,
-      "data-cid": "ProgressCircle",
-      children: [_jsx(ScreenReaderContent, {
-        children: _jsx("progress", {
-          max: valueMax,
-          value: valueNow,
-          "aria-valuetext": labelAndValueText
-        })
-      }), value && _jsx("span", {
-        css: styles?.center,
-        "aria-hidden": "true",
-        children: _jsx("span", {
-          css: styles?.value,
-          children: value
-        })
-      }), _jsxs("svg", {
-        css: styles?.circle,
-        role: "presentation",
-        focusable: "false",
-        children: [_jsx("circle", {
-          css: styles?.track,
-          role: "presentation",
-          cx: "50%",
-          cy: "50%",
-          r: styles?.radii?.radius
-        }), _jsx("circle", {
-          css: styles?.border,
-          role: "presentation",
-          cx: "50%",
-          cy: "50%",
-          r: styles?.radii?.borderOffsetRadius
-        }), _jsx("circle", {
-          css: styles?.meter,
-          role: "presentation",
-          style: style,
-          cx: "50%",
-          cy: "50%",
-          r: styles?.radii?.radius
-        })]
-      })]
-    });
-  }
-}) || _class);
+}
+ProgressCircle = _ts_decorate([
+    withStyleNew(generateStyle)
+], ProgressCircle);
 export default ProgressCircle;
-export { ProgressCircle };
+export { ProgressCircle };

package/es/ProgressCircle/v2/props.js

@@ -1,26 +1,16 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - present Instructure, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-const allowedProps = ['screenReaderLabel', 'size', 'valueMax', 'valueNow', 'formatScreenReaderValue', 'renderValue', 'color', 'meterColor', 'margin', 'elementRef', 'as', 'shouldAnimateOnMount', 'animationDelay'];
-export { allowedProps };
+const allowedProps = [
+    'screenReaderLabel',
+    'size',
+    'valueMax',
+    'valueNow',
+    'formatScreenReaderValue',
+    'renderValue',
+    'color',
+    'meterColor',
+    'margin',
+    'elementRef',
+    'as',
+    'shouldAnimateOnMount',
+    'animationDelay'
+];
+export { allowedProps };