@atlaskit/modal-dialog 14.11.1 → 14.11.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/modal-dialog
 
+## 14.11.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.11.1
 
 ### Patch Changes

package/codemods/__tests__/not-yet-boolean-autofocus-removal.tsx

@@ -152,4 +152,74 @@ describe('Remove autoFocus prop', () => {
     `,
 		'should remove autoFocus prop with aliased import',
 	);
+	defineInlineTest(
+		{ default: transformer, parser: 'tsx' },
+		{},
+		`
+      import React from 'react';
+      import Button from '@atlaskit/button';
+      import { ModalDialog } from '@atlaskit/modal-dialog';
+
+      const SimpleModalDialog = () => {
+        return (
+          <ModalDialog onClose={closeModal} width={1100}>
+            <Button appearance="primary" onClick={closeModal} autoFocus>
+              Close
+            </Button>
+          </ModalDialog>
+        );
+      }
+    `,
+		`
+      import React from 'react';
+      import Button from '@atlaskit/button';
+      import { ModalDialog } from '@atlaskit/modal-dialog';
+
+      const SimpleModalDialog = () => {
+        return (
+          <ModalDialog onClose={closeModal} width={1100}>
+            <Button appearance="primary" onClick={closeModal} autoFocus>
+              Close
+            </Button>
+          </ModalDialog>
+        );
+      }
+    `,
+		'should not remove autoFocus prop from component inside modal',
+	);
+	defineInlineTest(
+		{ default: transformer, parser: 'tsx' },
+		{},
+		`
+      import React from 'react';
+      import Button from '@atlaskit/button';
+      import { ModalDialog } from '@atlaskit/modal-dialog';
+
+      const SimpleModalDialog = () => {
+        return (
+          <ModalDialog onClose={closeModal} width={1100} autoFocus={false}>
+            <Button appearance="primary" onClick={closeModal} autoFocus>
+              Close
+            </Button>
+          </ModalDialog>
+        );
+      }
+    `,
+		`
+      import React from 'react';
+      import Button from '@atlaskit/button';
+      import { ModalDialog } from '@atlaskit/modal-dialog';
+
+      const SimpleModalDialog = () => {
+        return (
+          <ModalDialog onClose={closeModal} width={1100}>
+            <Button appearance="primary" onClick={closeModal} autoFocus>
+              Close
+            </Button>
+          </ModalDialog>
+        );
+      }
+    `,
+		'should remove modal autoFocus but not from component inside modal',
+	);
 });

package/codemods/utils.tsx

@@ -280,10 +280,15 @@ export const createRemoveFuncIfBooleanFor: (
 
 		source.findJSXElements(specifier).forEach((element) => {
 			getJSXAttributesByName(j, element, prop).forEach((attribute) => {
+				const el = attribute.parent.value;
 				if (
-					attribute.value.value === null ||
-					(attribute.value.value?.type === 'JSXExpressionContainer' &&
-						attribute.value.value.expression.type === 'BooleanLiteral')
+					// Verify the element we are working on is the element we want
+					el.type === 'JSXOpeningElement' &&
+					el.name.type === 'JSXIdentifier' &&
+					el.name.name === specifier &&
+					(attribute.value.value === null ||
+						(attribute.value.value?.type === 'JSXExpressionContainer' &&
+							attribute.value.value.expression.type === 'BooleanLiteral'))
 				) {
 					j(attribute).remove();
 					if (comment) {

package/dist/cjs/internal/components/modal-wrapper.js

@@ -88,7 +88,7 @@ var InternalModalWrapper = function InternalModalWrapper(props) {
     action: 'closed',
     componentName: 'modalDialog',
     packageName: "@atlaskit/modal-dialog",
-    packageVersion: "14.11.0"
+    packageVersion: "14.11.1"
   });
   var onBlanketClicked = (0, _react.useCallback)(function (e) {
     if (shouldCloseOnOverlayClick) {

package/dist/es2019/internal/components/modal-wrapper.js

@@ -75,7 +75,7 @@ const InternalModalWrapper = props => {
     action: 'closed',
     componentName: 'modalDialog',
     packageName: "@atlaskit/modal-dialog",
-    packageVersion: "14.11.0"
+    packageVersion: "14.11.1"
   });
   const onBlanketClicked = useCallback(e => {
     if (shouldCloseOnOverlayClick) {

package/dist/esm/internal/components/modal-wrapper.js

@@ -79,7 +79,7 @@ var InternalModalWrapper = function InternalModalWrapper(props) {
     action: 'closed',
     componentName: 'modalDialog',
     packageName: "@atlaskit/modal-dialog",
-    packageVersion: "14.11.0"
+    packageVersion: "14.11.1"
   });
   var onBlanketClicked = useCallback(function (e) {
     if (shouldCloseOnOverlayClick) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/modal-dialog",
-	"version": "14.11.1",
+	"version": "14.11.2",
 	"description": "A modal dialog displays content that requires user interaction, in a layer above the page.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 	"dependencies": {
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/blanket": "^15.0.0",
-		"@atlaskit/button": "^23.9.0",
+		"@atlaskit/button": "^23.10.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/ds-lib": "^5.3.0",
 		"@atlaskit/icon": "^32.0.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/portal": "^5.2.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/primitives": "^18.0.0",
-		"@atlaskit/theme": "^21.0.0",
+		"@atlaskit/theme": "^22.0.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
@@ -62,8 +62,8 @@
 		"@atlaskit/checkbox": "^17.3.0",
 		"@atlaskit/code": "^17.4.0",
 		"@atlaskit/datetime-picker": "^17.5.0",
-		"@atlaskit/docs": "^11.4.0",
-		"@atlaskit/dropdown-menu": "^16.4.0",
+		"@atlaskit/docs": "^11.5.0",
+		"@atlaskit/dropdown-menu": "^16.5.0",
 		"@atlaskit/flag": "^17.8.0",
 		"@atlaskit/form": "^15.3.0",
 		"@atlaskit/heading": "^5.3.0",