@instructure/ui-spinner 8.9.2-snapshot.2 → 8.9.2-snapshot.9

package/es/Spinner/index.js

@@ -78,7 +78,7 @@ let Spinner = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 =
   render() {
     var _this$props$styles, _this$props$styles2, _this$props$styles3, _this$props$styles4;
 
-    const passthroughProps = View.omitViewProps(omitProps(this.props, Spinner.propTypes), Spinner);
+    const passthroughProps = View.omitViewProps(omitProps(this.props, Spinner.allowedProps), Spinner);
     const hasTitle = this.props.renderTitle;
     error(hasTitle, '[Spinner] The renderTitle prop is necessary for screen reader support.');
     return jsx(View, Object.assign({}, passthroughProps, {

package/lib/Spinner/index.js

@@ -73,7 +73,7 @@ let Spinner = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   render() {
     var _this$props$styles, _this$props$styles2, _this$props$styles3, _this$props$styles4;
 
-    const passthroughProps = _View.View.omitViewProps((0, _omitProps.omitProps)(this.props, Spinner.propTypes), Spinner);
+    const passthroughProps = _View.View.omitViewProps((0, _omitProps.omitProps)(this.props, Spinner.allowedProps), Spinner);
 
     const hasTitle = this.props.renderTitle;
     (0, _console.logError)(hasTitle, '[Spinner] The renderTitle prop is necessary for screen reader support.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-spinner",
-  "version": "8.9.2-snapshot.2+99becd926",
+  "version": "8.9.2-snapshot.9+e92f12dda",
   "description": "A spinner/loading component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -25,22 +25,22 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.9.2-snapshot.2+99becd926",
-    "@instructure/emotion": "8.9.2-snapshot.2+99becd926",
-    "@instructure/shared-types": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-color-utils": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-react-utils": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-testable": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-utils": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-view": "8.9.2-snapshot.2+99becd926",
-    "@instructure/uid": "8.9.2-snapshot.2+99becd926",
+    "@instructure/console": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/emotion": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/shared-types": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-color-utils": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-react-utils": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-testable": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-utils": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-view": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/uid": "8.9.2-snapshot.9+e92f12dda",
     "prop-types": "^15"
   },
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-test-locator": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-test-utils": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-themes": "8.9.2-snapshot.2+99becd926"
+    "@instructure/ui-babel-preset": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-test-locator": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-test-utils": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-themes": "8.9.2-snapshot.9+e92f12dda"
   },
   "peerDependencies": {
     "react": ">=16.8 <=17"
@@ -49,5 +49,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "99becd9267e62cb5cc016317e4a77bcd1eb585a9"
+  "gitHead": "e92f12dda2e003c834e8728072d6ab60e4212c89"
 }

package/src/Spinner/index.tsx

@@ -85,7 +85,7 @@ class Spinner extends Component<SpinnerProps> {
 
   render() {
     const passthroughProps = View.omitViewProps(
-      omitProps(this.props, Spinner.propTypes),
+      omitProps(this.props, Spinner.allowedProps),
       Spinner
     )
 

package/src/Spinner/props.ts

@@ -25,8 +25,16 @@ import PropTypes from 'prop-types'
 
 import { ThemeablePropTypes } from '@instructure/emotion'
 
-import type { Spacing, WithStyleProps } from '@instructure/emotion'
-import type { AsElementType, PropValidators } from '@instructure/shared-types'
+import type {
+  Spacing,
+  WithStyleProps,
+  ComponentStyle
+} from '@instructure/emotion'
+import type {
+  AsElementType,
+  PropValidators,
+  SpinnerTheme
+} from '@instructure/shared-types'
 
 type SpinnerOwnProps = {
   renderTitle?: ((...args: any[]) => any) | React.ReactNode
@@ -41,7 +49,11 @@ type PropKeys = keyof SpinnerOwnProps
 
 type AllowedPropKeys = Readonly<Array<PropKeys>>
 
-type SpinnerProps = SpinnerOwnProps & WithStyleProps
+type SpinnerProps = SpinnerOwnProps & WithStyleProps<SpinnerTheme, SpinnerStyle>
+
+type SpinnerStyle = ComponentStyle<
+  'spinner' | 'circle' | 'circleTrack' | 'circleSpin'
+>
 
 const propTypes: PropValidators<PropKeys> = {
   /**
@@ -75,5 +87,5 @@ const allowedProps: AllowedPropKeys = [
   'as'
 ]
 
-export type { SpinnerProps }
+export type { SpinnerProps, SpinnerStyle }
 export { propTypes, allowedProps }

package/src/Spinner/styles.ts

@@ -23,8 +23,9 @@
  */
 
 import { keyframes } from '@instructure/emotion'
-import { SpinnerTheme } from '@instructure/shared-types'
-import { SpinnerProps } from './props'
+
+import type { SpinnerTheme } from '@instructure/shared-types'
+import type { SpinnerProps, SpinnerStyle } from './props'
 
 // keyframes have to be outside of 'generateStyle',
 // since it is causing problems in style recalculation
@@ -61,7 +62,7 @@ const morph = keyframes`
 const generateStyle = (
   componentTheme: SpinnerTheme,
   props: SpinnerProps
-): any => {
+): SpinnerStyle => {
   const { size, variant } = props
 
   const spinnerSizes = {

package/types/Spinner/props.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import type { Spacing, WithStyleProps } from '@instructure/emotion';
-import type { AsElementType, PropValidators } from '@instructure/shared-types';
+import type { Spacing, WithStyleProps, ComponentStyle } from '@instructure/emotion';
+import type { AsElementType, PropValidators, SpinnerTheme } from '@instructure/shared-types';
 declare type SpinnerOwnProps = {
     renderTitle?: ((...args: any[]) => any) | React.ReactNode;
     size?: 'x-small' | 'small' | 'medium' | 'large';
@@ -11,9 +11,10 @@ declare type SpinnerOwnProps = {
 };
 declare type PropKeys = keyof SpinnerOwnProps;
 declare type AllowedPropKeys = Readonly<Array<PropKeys>>;
-declare type SpinnerProps = SpinnerOwnProps & WithStyleProps;
+declare type SpinnerProps = SpinnerOwnProps & WithStyleProps<SpinnerTheme, SpinnerStyle>;
+declare type SpinnerStyle = ComponentStyle<'spinner' | 'circle' | 'circleTrack' | 'circleSpin'>;
 declare const propTypes: PropValidators<PropKeys>;
 declare const allowedProps: AllowedPropKeys;
-export type { SpinnerProps };
+export type { SpinnerProps, SpinnerStyle };
 export { propTypes, allowedProps };
 //# sourceMappingURL=props.d.ts.map

package/types/Spinner/props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../src/Spinner/props.ts"],"names":[],"mappings":";AA2BA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE9E,aAAK,eAAe,GAAG;IACrB,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,SAAS,CAAA;IACzD,IAAI,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;IAC/C,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACpC,EAAE,CAAC,EAAE,aAAa,CAAA;CACnB,CAAA;AAED,aAAK,QAAQ,GAAG,MAAM,eAAe,CAAA;AAErC,aAAK,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEhD,aAAK,YAAY,GAAG,eAAe,GAAG,cAAc,CAAA;AAEpD,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,QAAQ,CAqBvC,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,eAOnB,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../src/Spinner/props.ts"],"names":[],"mappings":";AA2BA,OAAO,KAAK,EACV,OAAO,EACP,cAAc,EACd,cAAc,EACf,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,YAAY,EACb,MAAM,2BAA2B,CAAA;AAElC,aAAK,eAAe,GAAG;IACrB,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,SAAS,CAAA;IACzD,IAAI,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;IAC/C,OAAO,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACpC,EAAE,CAAC,EAAE,aAAa,CAAA;CACnB,CAAA;AAED,aAAK,QAAQ,GAAG,MAAM,eAAe,CAAA;AAErC,aAAK,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEhD,aAAK,YAAY,GAAG,eAAe,GAAG,cAAc,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;AAEhF,aAAK,YAAY,GAAG,cAAc,CAChC,SAAS,GAAG,QAAQ,GAAG,aAAa,GAAG,YAAY,CACpD,CAAA;AAED,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,QAAQ,CAqBvC,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,eAOnB,CAAA;AAED,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA"}

package/types/Spinner/styles.d.ts

@@ -1,5 +1,5 @@
-import { SpinnerTheme } from '@instructure/shared-types';
-import { SpinnerProps } from './props';
+import type { SpinnerTheme } from '@instructure/shared-types';
+import type { SpinnerProps, SpinnerStyle } from './props';
 /**
  * ---
  * private: true
@@ -10,6 +10,6 @@ import { SpinnerProps } from './props';
  * @param  {Object} state the state of the component, the style is applied to
  * @return {Object} The final style object, which will be used in the component
  */
-declare const generateStyle: (componentTheme: SpinnerTheme, props: SpinnerProps) => any;
+declare const generateStyle: (componentTheme: SpinnerTheme, props: SpinnerProps) => SpinnerStyle;
 export default generateStyle;
 //# sourceMappingURL=styles.d.ts.map

package/types/Spinner/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../src/Spinner/styles.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAwBtC;;;;;;;;;GASG;AACH,QAAA,MAAM,aAAa,mBACD,YAAY,SACrB,YAAY,KAClB,GA4HF,CAAA;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../src/Spinner/styles.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAwBzD;;;;;;;;;GASG;AACH,QAAA,MAAM,aAAa,mBACD,YAAY,SACrB,YAAY,KAClB,YA4HF,CAAA;AAED,eAAe,aAAa,CAAA"}