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

package/es/ContextView/index.js

@@ -71,7 +71,7 @@ let ContextView = (_dec = withStyle(generateStyle, generateComponentTheme), _dec
           style = _this$props3.style,
           textAlign = _this$props3.textAlign,
           styles = _this$props3.styles;
-    return jsx(View, Object.assign({}, omitProps(this.props, ContextView.propTypes), {
+    return jsx(View, Object.assign({}, omitProps(this.props, ContextView.allowedProps), {
       css: styles === null || styles === void 0 ? void 0 : styles.contextView,
       style: style,
       borderWidth: "none",

package/lib/ContextView/index.js

@@ -61,7 +61,7 @@ let ContextView = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.defaul
           style = _this$props3.style,
           textAlign = _this$props3.textAlign,
           styles = _this$props3.styles;
-    return (0, _emotion.jsx)(_View.View, Object.assign({}, (0, _omitProps.omitProps)(this.props, ContextView.propTypes), {
+    return (0, _emotion.jsx)(_View.View, Object.assign({}, (0, _omitProps.omitProps)(this.props, ContextView.allowedProps), {
       css: styles === null || styles === void 0 ? void 0 : styles.contextView,
       style: style,
       borderWidth: "none",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-view",
-  "version": "8.9.2-snapshot.2+99becd926",
+  "version": "8.9.2-snapshot.9+e92f12dda",
   "description": "A component for basic styles including spacing, sizing, borders, display, positioning, and focus states.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -25,21 +25,21 @@
   "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-dom-utils": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-i18n": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-position": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-prop-types": "8.9.2-snapshot.2+99becd926",
-    "@instructure/ui-react-utils": "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-dom-utils": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-i18n": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-position": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-prop-types": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-react-utils": "8.9.2-snapshot.9+e92f12dda",
     "prop-types": "^15"
   },
   "devDependencies": {
-    "@instructure/ui-babel-preset": "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-utils": "8.9.2-snapshot.9+e92f12dda",
+    "@instructure/ui-themes": "8.9.2-snapshot.9+e92f12dda"
   },
   "peerDependencies": {
     "react": ">=16.8 <=17"
@@ -48,5 +48,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "99becd9267e62cb5cc016317e4a77bcd1eb585a9"
+  "gitHead": "e92f12dda2e003c834e8728072d6ab60e4212c89"
 }

package/src/ContextView/index.tsx

@@ -94,7 +94,7 @@ class ContextView extends Component<
 
     return (
       <View
-        {...omitProps(this.props, ContextView.propTypes)}
+        {...omitProps(this.props, ContextView.allowedProps)}
         css={styles?.contextView}
         style={style}
         borderWidth="none"

package/src/ContextView/props.ts

@@ -28,13 +28,18 @@ import PropTypes from 'prop-types'
 import { ThemeablePropTypes } from '@instructure/emotion'
 import { PositionPropTypes } from '@instructure/ui-position'
 
-import type { AsElementType, PropValidators } from '@instructure/shared-types'
+import type {
+  AsElementType,
+  PropValidators,
+  ContextViewTheme
+} from '@instructure/shared-types'
 import type { PlacementPropValues } from '@instructure/ui-position'
 import type {
   Shadow,
   Spacing,
   Stacking,
-  WithStyleProps
+  WithStyleProps,
+  ComponentStyle
 } from '@instructure/emotion'
 
 type ContextViewOwnProps = {
@@ -61,7 +66,16 @@ type PropKeys = keyof ContextViewOwnProps
 
 type AllowedPropKeys = Readonly<Array<PropKeys>>
 
-type ContextViewProps = ContextViewOwnProps & WithStyleProps
+type ContextViewProps = ContextViewOwnProps &
+  WithStyleProps<ContextViewTheme, ContextViewStyle>
+
+type ContextViewStyle = ComponentStyle<
+  | 'contextView'
+  | 'contextView__content'
+  | 'contextView__arrow'
+  | 'arrowSize'
+  | 'arrowBorderWidth'
+>
 
 const propTypes: PropValidators<PropKeys> = {
   /**
@@ -152,5 +166,5 @@ const allowedProps: AllowedPropKeys = [
   'debug'
 ]
 
-export type { ContextViewProps }
+export type { ContextViewProps, ContextViewStyle }
 export { propTypes, allowedProps }

package/src/ContextView/styles.ts

@@ -23,9 +23,10 @@
  */
 
 import { mirrorPlacement } from '@instructure/ui-position'
+
 import type { PlacementPropValues } from '@instructure/ui-position'
-import { ContextViewTheme } from '@instructure/shared-types'
-import { ContextViewProps } from './props'
+import type { ContextViewTheme } from '@instructure/shared-types'
+import type { ContextViewProps, ContextViewStyle } from './props'
 
 type PlacementArray = PlacementPropValues[]
 
@@ -259,7 +260,7 @@ const getArrowPlacementVariant = (
 const generateStyle = (
   componentTheme: ContextViewTheme,
   props: ContextViewProps
-) => {
+): ContextViewStyle => {
   const { placement, background } = props
 
   const arrowBaseStyles = {

package/src/View/props.ts

@@ -29,14 +29,15 @@ import { cursor as cursorPropTypes } from '@instructure/ui-prop-types'
 import { bidirectional } from '@instructure/ui-i18n'
 import { ThemeablePropTypes } from '@instructure/emotion'
 
-import type { AsElementType, PropValidators } from '@instructure/shared-types'
+import type { AsElementType, PropValidators, ViewTheme } from '@instructure/shared-types'
 import type {
   WithStyleProps,
   Spacing,
   BorderWidth,
   BorderRadii,
   Shadow,
-  Stacking
+  Stacking,
+  ComponentStyle
 } from '@instructure/emotion'
 
 type ViewOwnProps = {
@@ -180,10 +181,12 @@ type ViewOwnProps = {
 
 type PropKeys = keyof ViewOwnProps
 
-type ViewProps = ViewOwnProps & WithStyleProps
+type ViewProps = ViewOwnProps & WithStyleProps<ViewTheme, ViewStyle>
 
 type AllowedPropKeys = Readonly<Array<PropKeys>>
 
+type ViewStyle = ComponentStyle<'view' | 'inlineStyles'>
+
 const propTypes: PropValidators<PropKeys> = {
   as: PropTypes.elementType,
   elementRef: PropTypes.func,
@@ -294,4 +297,4 @@ const allowedProps: AllowedPropKeys = [
 ]
 
 export { propTypes, allowedProps }
-export type { ViewProps }
+export type { ViewProps, ViewStyle }

package/src/View/styles.ts

@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 import { DIRECTION } from '@instructure/ui-i18n'
 import {
   getShorthandPropValue,
@@ -29,12 +30,13 @@ import {
 } from '@instructure/emotion'
 import { pickProps } from '@instructure/ui-react-utils'
 import { logError as error } from '@instructure/console'
-import {
+
+import type {
   OtherHTMLAttributes,
   PartialRecord,
   ViewTheme
 } from '@instructure/shared-types'
-import { ViewProps } from './props'
+import type { ViewProps, ViewStyle } from './props'
 
 const getBorderStyle = ({
   borderRadius,
@@ -374,7 +376,10 @@ const getFocusStyles = (props: ViewProps, componentTheme: ViewTheme) => {
  * @param  {Object} extraArgs
  * @return {Object} The final style object, which will be used in the component
  */
-const generateStyle = (componentTheme: ViewTheme, props: ViewProps): any => {
+const generateStyle = (
+  componentTheme: ViewTheme,
+  props: ViewProps
+): ViewStyle => {
   const {
     borderRadius,
     borderWidth,

package/types/ContextView/props.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { AsElementType, PropValidators } from '@instructure/shared-types';
+import type { AsElementType, PropValidators, ContextViewTheme } from '@instructure/shared-types';
 import type { PlacementPropValues } from '@instructure/ui-position';
-import type { Shadow, Spacing, Stacking, WithStyleProps } from '@instructure/emotion';
+import type { Shadow, Spacing, Stacking, WithStyleProps, ComponentStyle } from '@instructure/emotion';
 declare type ContextViewOwnProps = {
     as?: AsElementType;
     elementRef?: (...args: any[]) => any;
@@ -23,9 +23,10 @@ declare type ContextViewOwnProps = {
 };
 declare type PropKeys = keyof ContextViewOwnProps;
 declare type AllowedPropKeys = Readonly<Array<PropKeys>>;
-declare type ContextViewProps = ContextViewOwnProps & WithStyleProps;
+declare type ContextViewProps = ContextViewOwnProps & WithStyleProps<ContextViewTheme, ContextViewStyle>;
+declare type ContextViewStyle = ComponentStyle<'contextView' | 'contextView__content' | 'contextView__arrow' | 'arrowSize' | 'arrowBorderWidth'>;
 declare const propTypes: PropValidators<PropKeys>;
 declare const allowedProps: AllowedPropKeys;
-export type { ContextViewProps };
+export type { ContextViewProps, ContextViewStyle };
 export { propTypes, allowedProps };
 //# sourceMappingURL=props.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../src/ContextView/props.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EACV,MAAM,EACN,OAAO,EACP,QAAQ,EACR,cAAc,EACf,MAAM,sBAAsB,CAAA;AAE7B,aAAK,mBAAmB,GAAG;IACzB,EAAE,CAAC,EAAE,aAAa,CAAA;IAClB,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;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAA;IACtC,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,SAAS,CAAC,EAAE,mBAAmB,CAAA;CAChC,CAAA;AAED,aAAK,QAAQ,GAAG,MAAM,mBAAmB,CAAA;AAEzC,aAAK,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEhD,aAAK,gBAAgB,GAAG,mBAAmB,GAAG,cAAc,CAAA;AAE5D,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,QAAQ,CAmEvC,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,eAkBnB,CAAA;AAED,YAAY,EAAE,gBAAgB,EAAE,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../src/ContextView/props.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,gBAAgB,EACjB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EACV,MAAM,EACN,OAAO,EACP,QAAQ,EACR,cAAc,EACd,cAAc,EACf,MAAM,sBAAsB,CAAA;AAE7B,aAAK,mBAAmB,GAAG;IACzB,EAAE,CAAC,EAAE,aAAa,CAAA;IAClB,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;IACvB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,SAAS,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAA;IACtC,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IAClC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,SAAS,CAAC,EAAE,mBAAmB,CAAA;CAChC,CAAA;AAED,aAAK,QAAQ,GAAG,MAAM,mBAAmB,CAAA;AAEzC,aAAK,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEhD,aAAK,gBAAgB,GAAG,mBAAmB,GACzC,cAAc,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAA;AAEpD,aAAK,gBAAgB,GAAG,cAAc,CAClC,aAAa,GACb,sBAAsB,GACtB,oBAAoB,GACpB,WAAW,GACX,kBAAkB,CACrB,CAAA;AAED,QAAA,MAAM,SAAS,EAAE,cAAc,CAAC,QAAQ,CAmEvC,CAAA;AAED,QAAA,MAAM,YAAY,EAAE,eAkBnB,CAAA;AAED,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA"}