@instructure/ui-modal 8.11.2-snapshot.7 → 8.12.0

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.12.0](https://github.com/instructure/instructure-ui/compare/v8.11.1...v8.12.0) (2021-11-17)
+
+### Bug Fixes
+
+- **ui-modal:** fix Modal.Header padding when it has CloseButton ([82b8314](https://github.com/instructure/instructure-ui/commit/82b8314a5ce13ef30c3f03125b1e2104ba81c889))
+
 ## [8.11.1](https://github.com/instructure/instructure-ui/compare/v8.11.0...v8.11.1) (2021-10-19)
 
 **Note:** Version bump only for package @instructure/ui-modal

package/es/Modal/ModalHeader/index.js

@@ -68,12 +68,13 @@ let ModalHeader = (_dec = withStyle(generateStyle, generateComponentTheme), _dec
   }
 
   get usesCloseButton() {
+    let hasCloseButton = false;
     React.Children.forEach(this.props.children, child => {
       if (child && matchComponentTypes(child, [CloseButton])) {
-        return true;
+        hasCloseButton = true;
       }
     });
-    return false;
+    return hasCloseButton;
   }
 
   render() {

package/es/package.json

@@ -0,0 +1 @@
+{"type":"module"}

package/lib/Modal/ModalHeader/index.js

@@ -64,13 +64,15 @@ let ModalHeader = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.defaul
   }
 
   get usesCloseButton() {
+    let hasCloseButton = false;
+
     _react.default.Children.forEach(this.props.children, child => {
       if (child && (0, _matchComponentTypes.matchComponentTypes)(child, [_CloseButton.CloseButton])) {
-        return true;
+        hasCloseButton = true;
       }
     });
 
-    return false;
+    return hasCloseButton;
   }
 
   render() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-modal",
-  "version": "8.11.2-snapshot.7+2681e145a",
+  "version": "8.12.0",
   "description": "A component for displaying content in a dialog overlay",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -25,35 +25,34 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/emotion": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/shared-types": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-buttons": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-dialog": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-motion": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-overlays": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-portal": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-prop-types": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-react-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-testable": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-view": "8.11.2-snapshot.7+2681e145a",
+    "@instructure/console": "8.12.0",
+    "@instructure/emotion": "8.12.0",
+    "@instructure/shared-types": "8.12.0",
+    "@instructure/ui-buttons": "8.12.0",
+    "@instructure/ui-dialog": "8.12.0",
+    "@instructure/ui-motion": "8.12.0",
+    "@instructure/ui-overlays": "8.12.0",
+    "@instructure/ui-portal": "8.12.0",
+    "@instructure/ui-prop-types": "8.12.0",
+    "@instructure/ui-react-utils": "8.12.0",
+    "@instructure/ui-testable": "8.12.0",
+    "@instructure/ui-utils": "8.12.0",
+    "@instructure/ui-view": "8.12.0",
     "prop-types": "^15"
   },
   "peerDependencies": {
     "react": ">=16.8 <=17"
   },
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-color-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-position": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-test-locator": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-test-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-themes": "8.11.2-snapshot.7+2681e145a"
+    "@instructure/ui-babel-preset": "8.12.0",
+    "@instructure/ui-color-utils": "8.12.0",
+    "@instructure/ui-position": "8.12.0",
+    "@instructure/ui-test-locator": "8.12.0",
+    "@instructure/ui-test-utils": "8.12.0",
+    "@instructure/ui-themes": "8.12.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "sideEffects": false,
-  "gitHead": "2681e145ad469e1396536d3e9eed75a19995eb8a"
+  "sideEffects": false
 }

package/src/Modal/ModalHeader/index.tsx

@@ -82,13 +82,15 @@ class ModalHeader extends Component<ModalHeaderProps> {
   }
 
   get usesCloseButton() {
-    // @ts-expect-error ts-migrate(7030) FIXME: Not all code paths return a value.
+    let hasCloseButton = false
+
     React.Children.forEach(this.props.children, (child) => {
       if (child && matchComponentTypes(child, [CloseButton])) {
-        return true
+        hasCloseButton = true
       }
     })
-    return false
+
+    return hasCloseButton
   }
 
   render() {

package/src/Modal/README.md

@@ -483,8 +483,8 @@ class Example extends React.Component {
           <Modal.Header spacing={this.state.smallViewport ? 'compact' : 'default'}>
             {this.renderCloseButton()}
             {this.state.smallViewport
-              ? <Text size="large">This Modal is optimized for small viewport</Text>
-              : <Heading>This is a deafult size Modal</Heading>
+              ? <Heading as="h2" level="h3" themeOverride={{ h3FontWeight: 400 }}>This Modal is optimized for small viewport</Heading>
+              : <Heading as="h2">This is a deafult size Modal</Heading>
             }
           </Modal.Header>
           <Modal.Body>

package/types/Modal/ModalHeader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Modal/ModalHeader/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAQxC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAEtE;;;;;GAKG;AACH,cAEM,WAAY,SAAQ,SAAS,CAAC,gBAAgB,CAAC;IACnD,MAAM,CAAC,QAAQ,CAAC,WAAW,kBAAiB;IAE5C,MAAM,CAAC,SAAS;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;MAIlB;IAED,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAE9B;IAED,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,cAAc,QAAO,qBAAqB,CAIzC;IAED,IAAI,eAAe,YAQlB;IAED,MAAM;CAaP;AAED,eAAe,WAAW,CAAA;AAC1B,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Modal/ModalHeader/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAQxC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAEtE;;;;;GAKG;AACH,cAEM,WAAY,SAAQ,SAAS,CAAC,gBAAgB,CAAC;IACnD,MAAM,CAAC,QAAQ,CAAC,WAAW,kBAAiB;IAE5C,MAAM,CAAC,SAAS;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;MAIlB;IAED,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAE9B;IAED,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,cAAc,QAAO,qBAAqB,CAIzC;IAED,IAAI,eAAe,YAUlB;IAED,MAAM;CAaP;AAED,eAAe,WAAW,CAAA;AAC1B,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/types/Modal/index.d.ts

@@ -31,7 +31,7 @@ declare class Modal extends Component<ModalProps> {
         mountNode?: import("@instructure/ui-position").PositionMountNode | undefined;
         insertAt?: "bottom" | "top" | undefined;
         liveRegion?: ReactElement<any, string | import("react").JSXElementConstructor<any>> | ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | ((...args: any[]) => any) | undefined;
-        transition?: import("@instructure/ui-motion/types/Transition/props").TransitionType | undefined;
+        transition?: import("@instructure/ui-motion/types/Transition/BaseTransition/props").TransitionType | undefined;
         onEnter?: ((...args: any[]) => any) | undefined;
         onEntering?: ((...args: any[]) => any) | undefined;
         onEntered?: ((...args: any[]) => any) | undefined;
@@ -58,7 +58,7 @@ declare class Modal extends Component<ModalProps> {
         mountNode?: import("@instructure/ui-position").PositionMountNode | undefined;
         insertAt?: "bottom" | "top" | undefined;
         liveRegion?: ReactElement<any, string | import("react").JSXElementConstructor<any>> | ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | ((...args: any[]) => any) | undefined;
-        transition?: import("@instructure/ui-motion/types/Transition/props").TransitionType | undefined;
+        transition?: import("@instructure/ui-motion/types/Transition/BaseTransition/props").TransitionType | undefined;
         onEnter?: ((...args: any[]) => any) | undefined;
         onEntering?: ((...args: any[]) => any) | undefined;
         onEntered?: ((...args: any[]) => any) | undefined;

package/LICENSE.md

@@ -1,27 +0,0 @@
----
-title: The MIT License (MIT)
-category: Getting Started
-order: 9
----
-
-# The MIT License (MIT)
-
-Copyright (c) 2015 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.