@instructure/ui-img 8.8.1-snapshot.7 → 8.9.1-snapshot.2

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.9.0](https://github.com/instructure/instructure-ui/compare/v8.8.0...v8.9.0) (2021-09-15)
+
+### Bug Fixes
+
+- fix shared-types TS errors ([7b83164](https://github.com/instructure/instructure-ui/commit/7b83164f4c5872f3a217e010563f59bf584ae4fc))
+
 # [8.8.0](https://github.com/instructure/instructure-ui/compare/v8.7.0...v8.8.0) (2021-08-27)
 
 **Note:** Version bump only for package @instructure/ui-img

package/es/Img/index.js

@@ -29,13 +29,13 @@ var _dec, _dec2, _class, _class2, _temp;
 
 /** @jsx jsx */
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { View } from '@instructure/ui-view';
 import { passthroughProps } from '@instructure/ui-react-utils';
 import { testable } from '@instructure/ui-testable';
-import { withStyle, jsx, ThemeablePropTypes } from '@instructure/emotion';
+import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
+import { propTypes, allowedProps } from './props';
 
 /**
 ---
@@ -71,7 +71,7 @@ let Img = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = test
       alt: alt || ''
     };
     const imageProps = {
-      css: styles.img,
+      css: styles === null || styles === void 0 ? void 0 : styles.img,
       src
     };
     const containerProps = { ...passthroughProps(props),
@@ -88,10 +88,10 @@ let Img = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = test
       };
       return jsx(View, Object.assign({}, rootProps, {
         as: "span",
-        css: styles.container
+        css: styles === null || styles === void 0 ? void 0 : styles.container
       }), jsx("img", Object.assign({}, imageProps, a11yProps)) // eslint-disable-line jsx-a11y/alt-text
       , overlay && jsx("span", {
-        css: styles.overlay
+        css: styles === null || styles === void 0 ? void 0 : styles.overlay
       }));
     } else {
       return jsx(View, Object.assign({}, containerProps, imageProps, a11yProps, {
@@ -100,44 +100,7 @@ let Img = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = test
     }
   }
 
-}, _class2.displayName = "Img", _class2.componentId = 'Img', _class2.propTypes = {
-  // eslint-disable-next-line react/require-default-props
-  makeStyles: PropTypes.func,
-  // eslint-disable-next-line react/require-default-props
-  styles: PropTypes.object,
-  src: PropTypes.string.isRequired,
-  alt: PropTypes.string,
-  display: PropTypes.oneOf(['inline-block', 'block']),
-
-  /**
-   * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
-   * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
-   * familiar CSS-like shorthand. For example: `margin="small auto large"`.
-   */
-  margin: ThemeablePropTypes.spacing,
-
-  /**
-   * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
-   * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
-   */
-  overlay: PropTypes.shape({
-    color: PropTypes.string.isRequired,
-    opacity: PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).isRequired,
-    blend: PropTypes.oneOf(['normal', 'multiply', 'screen', 'overlay', 'color-burn'])
-  }),
-  withGrayscale: PropTypes.bool,
-  withBlur: PropTypes.bool,
-  constrain: PropTypes.oneOf(['cover', 'contain']),
-  elementRef: PropTypes.func,
-  height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  width: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-}, _class2.defaultProps = {
-  margin: void 0,
-  overlay: void 0,
-  constrain: void 0,
-  elementRef: void 0,
-  height: void 0,
-  width: void 0,
+}, _class2.displayName = "Img", _class2.componentId = 'Img', _class2.propTypes = propTypes, _class2.allowedProps = allowedProps, _class2.defaultProps = {
   alt: '',
   display: 'inline-block',
   withGrayscale: false,

package/es/Img/props.js

@@ -0,0 +1,55 @@
+/*
+ * 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 PropTypes from 'prop-types';
+import { ThemeablePropTypes } from '@instructure/emotion';
+const propTypes = {
+  src: PropTypes.string.isRequired,
+  alt: PropTypes.string,
+  display: PropTypes.oneOf(['inline-block', 'block']),
+
+  /**
+   * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
+   * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
+   * familiar CSS-like shorthand. For example: `margin="small auto large"`.
+   */
+  margin: ThemeablePropTypes.spacing,
+
+  /**
+   * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
+   * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
+   */
+  overlay: PropTypes.shape({
+    color: PropTypes.string.isRequired,
+    opacity: PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).isRequired,
+    blend: PropTypes.oneOf(['normal', 'multiply', 'screen', 'overlay', 'color-burn'])
+  }),
+  withGrayscale: PropTypes.bool,
+  withBlur: PropTypes.bool,
+  constrain: PropTypes.oneOf(['cover', 'contain']),
+  elementRef: PropTypes.func,
+  height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  width: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+};
+const allowedProps = ['src', 'alt', 'display', 'margin', 'overlay', 'withGrayscale', 'withBlur', 'constrain', 'elementRef', 'height', 'width'];
+export { propTypes, allowedProps };

package/lib/Img/index.js

@@ -11,8 +11,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = require("react");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _View = require("@instructure/ui-view/lib/View");
 
 var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
@@ -25,6 +23,8 @@ var _styles = _interopRequireDefault(require("./styles"));
 
 var _theme = _interopRequireDefault(require("./theme"));
 
+var _props = require("./props");
+
 const _excluded = ["src", "alt", "margin", "display", "overlay", "withGrayscale", "withBlur", "constrain", "width", "height", "elementRef", "styles"];
 
 var _dec, _dec2, _class, _class2, _temp;
@@ -62,7 +62,7 @@ let Img = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec
       alt: alt || ''
     };
     const imageProps = {
-      css: styles.img,
+      css: styles === null || styles === void 0 ? void 0 : styles.img,
       src
     };
     const containerProps = { ...(0, _passthroughProps.passthroughProps)(props),
@@ -79,10 +79,10 @@ let Img = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec
       };
       return (0, _emotion.jsx)(_View.View, Object.assign({}, rootProps, {
         as: "span",
-        css: styles.container
+        css: styles === null || styles === void 0 ? void 0 : styles.container
       }), (0, _emotion.jsx)("img", Object.assign({}, imageProps, a11yProps)) // eslint-disable-line jsx-a11y/alt-text
       , overlay && (0, _emotion.jsx)("span", {
-        css: styles.overlay
+        css: styles === null || styles === void 0 ? void 0 : styles.overlay
       }));
     } else {
       return (0, _emotion.jsx)(_View.View, Object.assign({}, containerProps, imageProps, a11yProps, {
@@ -91,44 +91,7 @@ let Img = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec
     }
   }
 
-}, _class2.displayName = "Img", _class2.componentId = 'Img', _class2.propTypes = {
-  // eslint-disable-next-line react/require-default-props
-  makeStyles: _propTypes.default.func,
-  // eslint-disable-next-line react/require-default-props
-  styles: _propTypes.default.object,
-  src: _propTypes.default.string.isRequired,
-  alt: _propTypes.default.string,
-  display: _propTypes.default.oneOf(['inline-block', 'block']),
-
-  /**
-   * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
-   * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
-   * familiar CSS-like shorthand. For example: `margin="small auto large"`.
-   */
-  margin: _emotion.ThemeablePropTypes.spacing,
-
-  /**
-   * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
-   * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
-   */
-  overlay: _propTypes.default.shape({
-    color: _propTypes.default.string.isRequired,
-    opacity: _propTypes.default.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).isRequired,
-    blend: _propTypes.default.oneOf(['normal', 'multiply', 'screen', 'overlay', 'color-burn'])
-  }),
-  withGrayscale: _propTypes.default.bool,
-  withBlur: _propTypes.default.bool,
-  constrain: _propTypes.default.oneOf(['cover', 'contain']),
-  elementRef: _propTypes.default.func,
-  height: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
-  width: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
-}, _class2.defaultProps = {
-  margin: void 0,
-  overlay: void 0,
-  constrain: void 0,
-  elementRef: void 0,
-  height: void 0,
-  width: void 0,
+}, _class2.displayName = "Img", _class2.componentId = 'Img', _class2.propTypes = _props.propTypes, _class2.allowedProps = _props.allowedProps, _class2.defaultProps = {
   alt: '',
   display: 'inline-block',
   withGrayscale: false,

package/lib/Img/props.js

@@ -0,0 +1,67 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.allowedProps = exports.propTypes = void 0;
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _emotion = require("@instructure/emotion");
+
+/*
+ * 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 propTypes = {
+  src: _propTypes.default.string.isRequired,
+  alt: _propTypes.default.string,
+  display: _propTypes.default.oneOf(['inline-block', 'block']),
+
+  /**
+   * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
+   * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
+   * familiar CSS-like shorthand. For example: `margin="small auto large"`.
+   */
+  margin: _emotion.ThemeablePropTypes.spacing,
+
+  /**
+   * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
+   * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
+   */
+  overlay: _propTypes.default.shape({
+    color: _propTypes.default.string.isRequired,
+    opacity: _propTypes.default.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).isRequired,
+    blend: _propTypes.default.oneOf(['normal', 'multiply', 'screen', 'overlay', 'color-burn'])
+  }),
+  withGrayscale: _propTypes.default.bool,
+  withBlur: _propTypes.default.bool,
+  constrain: _propTypes.default.oneOf(['cover', 'contain']),
+  elementRef: _propTypes.default.func,
+  height: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  width: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
+};
+exports.propTypes = propTypes;
+const allowedProps = ['src', 'alt', 'display', 'margin', 'overlay', 'withGrayscale', 'withBlur', 'constrain', 'elementRef', 'height', 'width'];
+exports.allowedProps = allowedProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-img",
-  "version": "8.8.1-snapshot.7+90b251d58",
+  "version": "8.9.1-snapshot.2+7f5faa3df",
   "description": "An accessible image component.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -25,19 +25,19 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/emotion": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-dom-utils": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-react-utils": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-testable": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-view": "8.8.1-snapshot.7+90b251d58",
+    "@instructure/console": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/emotion": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/shared-types": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/ui-dom-utils": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/ui-react-utils": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/ui-testable": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/ui-view": "8.9.1-snapshot.2+7f5faa3df",
     "prop-types": "^15"
   },
   "devDependencies": {
-    "@instructure/shared-types": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-babel-preset": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-test-locator": "8.8.1-snapshot.7+90b251d58",
-    "@instructure/ui-test-utils": "8.8.1-snapshot.7+90b251d58"
+    "@instructure/ui-babel-preset": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/ui-test-locator": "8.9.1-snapshot.2+7f5faa3df",
+    "@instructure/ui-test-utils": "8.9.1-snapshot.2+7f5faa3df"
   },
   "peerDependencies": {
     "react": ">=16.8 <=17"
@@ -46,5 +46,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "90b251d580c75205b6cbb884fe922059cfc494dd"
+  "gitHead": "7f5faa3df83667636304e0901ef1008d98dffc9a"
 }

package/src/Img/index.tsx

@@ -23,17 +23,18 @@
  */
 /** @jsx jsx */
 import { Component } from 'react'
-import PropTypes from 'prop-types'
 
 import { View } from '@instructure/ui-view'
 import { passthroughProps } from '@instructure/ui-react-utils'
 import { testable } from '@instructure/ui-testable'
 
-import { withStyle, jsx, ThemeablePropTypes } from '@instructure/emotion'
+import { withStyle, jsx } from '@instructure/emotion'
 
 import generateStyle from './styles'
 import generateComponentTheme from './theme'
-import { ImgProps } from './types'
+
+import { propTypes, allowedProps } from './props'
+import type { ImgProps } from './props'
 
 /**
 ---
@@ -45,50 +46,9 @@ category: components
 class Img extends Component<ImgProps> {
   static readonly componentId = 'Img'
 
-  static propTypes = {
-    // eslint-disable-next-line react/require-default-props
-    makeStyles: PropTypes.func,
-    // eslint-disable-next-line react/require-default-props
-    styles: PropTypes.object,
-    src: PropTypes.string.isRequired,
-    alt: PropTypes.string,
-    display: PropTypes.oneOf(['inline-block', 'block']),
-    /**
-     * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
-     * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
-     * familiar CSS-like shorthand. For example: `margin="small auto large"`.
-     */
-    margin: ThemeablePropTypes.spacing,
-    /**
-     * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
-     * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
-     */
-    overlay: PropTypes.shape({
-      color: PropTypes.string.isRequired,
-      opacity: PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).isRequired,
-      blend: PropTypes.oneOf([
-        'normal',
-        'multiply',
-        'screen',
-        'overlay',
-        'color-burn'
-      ])
-    }),
-    withGrayscale: PropTypes.bool,
-    withBlur: PropTypes.bool,
-    constrain: PropTypes.oneOf(['cover', 'contain']),
-    elementRef: PropTypes.func,
-    height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    width: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
-  }
-
+  static propTypes = propTypes
+  static allowedProps = allowedProps
   static defaultProps = {
-    margin: undefined,
-    overlay: undefined,
-    constrain: undefined,
-    elementRef: undefined,
-    height: undefined,
-    width: undefined,
     alt: '',
     display: 'inline-block',
     withGrayscale: false,
@@ -127,7 +87,7 @@ class Img extends Component<ImgProps> {
     }
 
     const imageProps = {
-      css: styles.img,
+      css: styles?.img,
       src
     }
 
@@ -147,11 +107,11 @@ class Img extends Component<ImgProps> {
       }
 
       return (
-        <View {...rootProps} as="span" css={styles.container}>
+        <View {...rootProps} as="span" css={styles?.container}>
           {
             <img {...imageProps} {...a11yProps} /> // eslint-disable-line jsx-a11y/alt-text
           }
-          {overlay && <span css={styles.overlay} />}
+          {overlay && <span css={styles?.overlay} />}
         </View>
       )
     } else {

package/src/Img/props.ts

@@ -0,0 +1,102 @@
+/*
+ * 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 type { Spacing, WithStyleProps } from '@instructure/emotion'
+import { PropValidators } from '@instructure/shared-types'
+import PropTypes from 'prop-types'
+import { ThemeablePropTypes } from '@instructure/emotion'
+
+type ImgOwnProps = {
+  src: string
+  alt?: string
+  display?: 'inline-block' | 'block'
+  margin?: Spacing
+  overlay?: {
+    color: string
+    opacity: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10
+    blend?: 'normal' | 'multiply' | 'screen' | 'overlay' | 'color-burn'
+  }
+  withGrayscale?: boolean
+  withBlur?: boolean
+  constrain?: 'cover' | 'contain'
+  elementRef?: (...args: any[]) => any
+  height?: string | number
+  width?: string | number
+}
+
+type PropKeys = keyof ImgOwnProps
+
+type AllowedPropKeys = Readonly<Array<PropKeys>>
+
+type ImgProps = ImgOwnProps & WithStyleProps
+
+const propTypes: PropValidators<PropKeys> = {
+  src: PropTypes.string.isRequired,
+  alt: PropTypes.string,
+  display: PropTypes.oneOf(['inline-block', 'block']),
+  /**
+   * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
+   * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
+   * familiar CSS-like shorthand. For example: `margin="small auto large"`.
+   */
+  margin: ThemeablePropTypes.spacing,
+  /**
+   * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
+   * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
+   */
+  overlay: PropTypes.shape({
+    color: PropTypes.string.isRequired,
+    opacity: PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]).isRequired,
+    blend: PropTypes.oneOf([
+      'normal',
+      'multiply',
+      'screen',
+      'overlay',
+      'color-burn'
+    ])
+  }),
+  withGrayscale: PropTypes.bool,
+  withBlur: PropTypes.bool,
+  constrain: PropTypes.oneOf(['cover', 'contain']),
+  elementRef: PropTypes.func,
+  height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  width: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+}
+
+const allowedProps: AllowedPropKeys = [
+  'src',
+  'alt',
+  'display',
+  'margin',
+  'overlay',
+  'withGrayscale',
+  'withBlur',
+  'constrain',
+  'elementRef',
+  'height',
+  'width'
+]
+
+export type { ImgProps }
+export { propTypes, allowedProps }

package/src/Img/styles.ts

@@ -23,7 +23,7 @@
  */
 
 import { ImgTheme } from '@instructure/shared-types'
-import { ImgProps } from './types'
+import { ImgProps } from './props'
 
 /**
  * ---

package/src/index.ts

@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 export { Img } from './Img'
-export type { ImgProps } from './Img/types'
+export type { ImgProps } from './Img/props'

package/types/Img/index.d.ts

@@ -1,8 +1,7 @@
 /** @jsx jsx */
 import { Component } from 'react';
-import PropTypes from 'prop-types';
 import { jsx } from '@instructure/emotion';
-import { ImgProps } from './types';
+import type { ImgProps } from './props';
 /**
 ---
 category: components
@@ -10,41 +9,41 @@ category: components
 **/
 declare class Img extends Component<ImgProps> {
     static readonly componentId = "Img";
-    static propTypes: {
-        makeStyles: PropTypes.Requireable<(...args: any[]) => any>;
-        styles: PropTypes.Requireable<object>;
-        src: PropTypes.Validator<string>;
-        alt: PropTypes.Requireable<string>;
-        display: PropTypes.Requireable<string>;
-        /**
-         * Valid values are `0`, `none`, `auto`, `xxx-small`, `xx-small`, `x-small`,
-         * `small`, `medium`, `large`, `x-large`, `xx-large`. Apply these values via
-         * familiar CSS-like shorthand. For example: `margin="small auto large"`.
-         */
-        margin: (props: any, propName: any, componentName: any, location: any) => any;
-        /**
-         * Valid values for `opacity` are `0` - `10`. Valid values for `blend` are
-         * `normal` (default), `multiply`, `screen`, `overlay`, and `color-burn`.
-         */
-        overlay: PropTypes.Requireable<PropTypes.InferProps<{
-            color: PropTypes.Validator<string>;
-            opacity: PropTypes.Validator<number>;
-            blend: PropTypes.Requireable<string>;
-        }>>;
-        withGrayscale: PropTypes.Requireable<boolean>;
-        withBlur: PropTypes.Requireable<boolean>;
-        constrain: PropTypes.Requireable<string>;
-        elementRef: PropTypes.Requireable<(...args: any[]) => any>;
-        height: PropTypes.Requireable<string | number>;
-        width: PropTypes.Requireable<string | number>;
-    };
+    static propTypes: import("@instructure/shared-types/types/UtilityTypes").PropValidators<keyof {
+        src: string;
+        alt?: string | undefined;
+        display?: "inline-block" | "block" | undefined;
+        margin?: import("@instructure/emotion/types/styleUtils/ThemeablePropValues").Spacing | undefined;
+        overlay?: {
+            color: string;
+            opacity: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+            blend?: "normal" | "multiply" | "screen" | "overlay" | "color-burn" | undefined;
+        } | undefined;
+        withGrayscale?: boolean | undefined;
+        withBlur?: boolean | undefined;
+        constrain?: "cover" | "contain" | undefined;
+        elementRef?: ((...args: any[]) => any) | undefined;
+        height?: string | number | undefined;
+        width?: string | number | undefined;
+    }>;
+    static allowedProps: readonly (keyof {
+        src: string;
+        alt?: string | undefined;
+        display?: "inline-block" | "block" | undefined;
+        margin?: import("@instructure/emotion/types/styleUtils/ThemeablePropValues").Spacing | undefined;
+        overlay?: {
+            color: string;
+            opacity: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+            blend?: "normal" | "multiply" | "screen" | "overlay" | "color-burn" | undefined;
+        } | undefined;
+        withGrayscale?: boolean | undefined;
+        withBlur?: boolean | undefined;
+        constrain?: "cover" | "contain" | undefined;
+        elementRef?: ((...args: any[]) => any) | undefined;
+        height?: string | number | undefined;
+        width?: string | number | undefined;
+    })[];
     static defaultProps: {
-        margin: undefined;
-        overlay: undefined;
-        constrain: undefined;
-        elementRef: undefined;
-        height: undefined;
-        width: undefined;
         alt: string;
         display: string;
         withGrayscale: boolean;

package/types/Img/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Img/index.tsx"],"names":[],"mappings":"AAuBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,SAAS,MAAM,YAAY,CAAA;AAMlC,OAAO,EAAa,GAAG,EAAsB,MAAM,sBAAsB,CAAA;AAIzE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC;;;;GAIG;AACH,cAEM,GAAI,SAAQ,SAAS,CAAC,QAAQ,CAAC;IACnC,MAAM,CAAC,QAAQ,CAAC,WAAW,SAAQ;IAEnC,MAAM,CAAC,SAAS;;;;;;QAQd;;;;WAIG;;QAEH;;;WAGG;;;;;;;;;;;;MAkBJ;IAED,MAAM,CAAC,YAAY;;;;;;;;;;;MAWlB;IAED,iBAAiB;IAKjB,kBAAkB;IAKlB,MAAM;CAuDP;AAED,eAAe,GAAG,CAAA;AAClB,OAAO,EAAE,GAAG,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Img/index.tsx"],"names":[],"mappings":"AAuBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAMjC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEvC;;;;GAIG;AACH,cAEM,GAAI,SAAQ,SAAS,CAAC,QAAQ,CAAC;IACnC,MAAM,CAAC,QAAQ,CAAC,WAAW,SAAQ;IAEnC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;;MAKlB;IAED,iBAAiB;IAKjB,kBAAkB;IAKlB,MAAM;CAuDP;AAED,eAAe,GAAG,CAAA;AAClB,OAAO,EAAE,GAAG,EAAE,CAAA"}

package/types/Img/props.d.ts

@@ -0,0 +1,27 @@
+import type { Spacing, WithStyleProps } from '@instructure/emotion';
+import { PropValidators } from '@instructure/shared-types';
+declare type ImgOwnProps = {
+    src: string;
+    alt?: string;
+    display?: 'inline-block' | 'block';
+    margin?: Spacing;
+    overlay?: {
+        color: string;
+        opacity: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+        blend?: 'normal' | 'multiply' | 'screen' | 'overlay' | 'color-burn';
+    };
+    withGrayscale?: boolean;
+    withBlur?: boolean;
+    constrain?: 'cover' | 'contain';
+    elementRef?: (...args: any[]) => any;
+    height?: string | number;
+    width?: string | number;
+};
+declare type PropKeys = keyof ImgOwnProps;
+declare type AllowedPropKeys = Readonly<Array<PropKeys>>;
+declare type ImgProps = ImgOwnProps & WithStyleProps;
+declare const propTypes: PropValidators<PropKeys>;
+declare const allowedProps: AllowedPropKeys;
+export type { ImgProps };
+export { propTypes, allowedProps };
+//# sourceMappingURL=props.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../src/Img/props.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,aAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IAClC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QACnD,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,CAAA;KACpE,CAAA;IACD,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC/B,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACpC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACxB,CAAA;AAED,aAAK,QAAQ,GAAG,MAAM,WAAW,CAAA;AAEjC,aAAK,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEhD,aAAK,QAAQ,GAAG,WAAW,GAAG,cAAc,CAAA;AAE5C,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,QAAQ,CA+BvC,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,eAYnB,CAAA;AAED,YAAY,EAAE,QAAQ,EAAE,CAAA;AACxB,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA"}

package/types/Img/styles.d.ts

@@ -1,5 +1,5 @@
 import { ImgTheme } from '@instructure/shared-types';
-import { ImgProps } from './types';
+import { ImgProps } from './props';
 /**
  * ---
  * private: true

package/types/index.d.ts

@@ -1,3 +1,3 @@
 export { Img } from './Img';
-export type { ImgProps } from './Img/types';
+export type { ImgProps } from './Img/props';
 //# sourceMappingURL=index.d.ts.map

package/es/Img/types.js

@@ -1 +0,0 @@
-export {};

package/lib/Img/types.js

@@ -1 +0,0 @@
-"use strict";

package/src/Img/types.ts

@@ -1,45 +0,0 @@
-/*
- * 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 type { Spacing } from '@instructure/emotion'
-
-export type ImgProps = {
-  makeStyles?: (...args: any[]) => any
-  styles?: any
-  src: string
-  alt?: string
-  display?: 'inline-block' | 'block'
-  margin?: Spacing
-  overlay?: {
-    color: string
-    opacity: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10
-    blend?: 'normal' | 'multiply' | 'screen' | 'overlay' | 'color-burn'
-  }
-  withGrayscale?: boolean
-  withBlur?: boolean
-  constrain?: 'cover' | 'contain'
-  elementRef?: (...args: any[]) => any
-  height?: string | number
-  width?: string | number
-}

package/types/Img/types.d.ts

@@ -1,21 +0,0 @@
-import type { Spacing } from '@instructure/emotion';
-export declare type ImgProps = {
-    makeStyles?: (...args: any[]) => any;
-    styles?: any;
-    src: string;
-    alt?: string;
-    display?: 'inline-block' | 'block';
-    margin?: Spacing;
-    overlay?: {
-        color: string;
-        opacity: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
-        blend?: 'normal' | 'multiply' | 'screen' | 'overlay' | 'color-burn';
-    };
-    withGrayscale?: boolean;
-    withBlur?: boolean;
-    constrain?: 'cover' | 'contain';
-    elementRef?: (...args: any[]) => any;
-    height?: string | number;
-    width?: string | number;
-};
-//# sourceMappingURL=types.d.ts.map

package/types/Img/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/Img/types.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAEnD,oBAAY,QAAQ,GAAG;IACrB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACpC,MAAM,CAAC,EAAE,GAAG,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAA;IAClC,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE;QACR,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;QACnD,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,CAAA;KACpE,CAAA;IACD,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC/B,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACpC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACxB,CAAA"}