@atlaskit/link-datasource 4.18.2 → 4.19.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/link-datasource
 
+## 4.19.0
+
+### Minor Changes
+
+- [#195804](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/195804)
+  [`3145c64a9e71a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3145c64a9e71a) -
+  NAVX-1180 updating datasource modal return focus to specific element if ref is provided
+
+### Patch Changes
+
+- [#195926](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/195926)
+  [`3aa517526ff72`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3aa517526ff72) -
+  NAVX-1285 cleaning up fix_a11y_issues_inline_edit
+- Updated dependencies
+
 ## 4.18.2
 
 ### Patch Changes

package/dist/cjs/ui/assets-modal/search-container/aql-search-input/index.js

@@ -158,9 +158,8 @@ var AqlSearchInput = exports.AqlSearchInput = function AqlSearchInput(_ref2) {
         className: (0, _runtime.ax)(["_2hwx12x7"])
       })),
       placeholder: formatMessage(_messages.searchInputMessages.placeholder),
-      testId: testId
-    }, (0, _platformFeatureFlags.fg)('fix_a11y_issues_inline_edit') && {
-      'aria-label': formatMessage(_messages.searchInputMessages.placeholder)
+      testId: testId,
+      "aria-label": formatMessage(_messages.searchInputMessages.placeholder)
     })), lastValidationResult.type === 'invalid' && lastValidationResult.error && /*#__PURE__*/React.createElement(_form.ErrorMessage, null, lastValidationResult.error));
   }));
 };

package/dist/cjs/ui/common/modal/datasource-modal/index.js

@@ -22,12 +22,14 @@ var ScreenEvent = function ScreenEvent() {
 var DatasourceModal = exports.DatasourceModal = function DatasourceModal(_ref) {
   var testId = _ref.testId,
     onClose = _ref.onClose,
-    children = _ref.children;
+    children = _ref.children,
+    _ref$shouldReturnFocu = _ref.shouldReturnFocus,
+    shouldReturnFocus = _ref$shouldReturnFocu === void 0 ? false : _ref$shouldReturnFocu;
   return /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
     testId: testId,
     onClose: onClose,
     width: "calc(100% - 80px)",
     shouldScrollInViewport: true,
-    shouldReturnFocus: (0, _platformFeatureFlags.fg)('navx-1180-sllv-return-focus-on-escape') ? true : false
+    shouldReturnFocus: (0, _platformFeatureFlags.fg)('navx-1180-sllv-return-focus-on-escape') ? shouldReturnFocus : false
   }, /*#__PURE__*/_react.default.createElement(ScreenEvent, null), children);
 };

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -68,7 +68,8 @@ var isValidParameters = function isValidParameters(parameters) {
 };
 var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var onCancel = props.onCancel,
-    urlBeingEdited = props.url;
+    urlBeingEdited = props.url,
+    shouldReturnFocus = props.shouldReturnFocus;
   var _useDatasourceContext = (0, _datasourceContext.useDatasourceContext)(),
     visibleColumnCount = _useDatasourceContext.visibleColumnCount,
     visibleColumnKeys = _useDatasourceContext.visibleColumnKeys,
@@ -368,7 +369,8 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
   }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {
     testId: "jira-datasource-modal",
-    onClose: onCancel
+    onClose: onCancel,
+    shouldReturnFocus: shouldReturnFocus
   }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

package/dist/es2019/ui/assets-modal/search-container/aql-search-input/index.js

@@ -149,8 +149,7 @@ export const AqlSearchInput = ({
       className: ax(["_2hwx12x7"])
     })),
     placeholder: formatMessage(searchInputMessages.placeholder),
-    testId: testId
-  }, fg('fix_a11y_issues_inline_edit') && {
-    'aria-label': formatMessage(searchInputMessages.placeholder)
+    testId: testId,
+    "aria-label": formatMessage(searchInputMessages.placeholder)
   })), lastValidationResult.type === 'invalid' && lastValidationResult.error && /*#__PURE__*/React.createElement(ErrorMessage, null, lastValidationResult.error))));
 };

package/dist/es2019/ui/common/modal/datasource-modal/index.js

@@ -14,13 +14,14 @@ const ScreenEvent = () => {
 export const DatasourceModal = ({
   testId,
   onClose,
-  children
+  children,
+  shouldReturnFocus = false
 }) => {
   return /*#__PURE__*/React.createElement(Modal, {
     testId: testId,
     onClose: onClose,
     width: "calc(100% - 80px)",
     shouldScrollInViewport: true,
-    shouldReturnFocus: fg('navx-1180-sllv-return-focus-on-escape') ? true : false
+    shouldReturnFocus: fg('navx-1180-sllv-return-focus-on-escape') ? shouldReturnFocus : false
   }, /*#__PURE__*/React.createElement(ScreenEvent, null), children);
 };

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -56,7 +56,8 @@ const isValidParameters = parameters => typeof (parameters === null || parameter
 const PlainJiraIssuesConfigModal = props => {
   const {
     onCancel,
-    url: urlBeingEdited
+    url: urlBeingEdited,
+    shouldReturnFocus
   } = props;
   const {
     visibleColumnCount,
@@ -355,7 +356,8 @@ const PlainJiraIssuesConfigModal = props => {
     loaderFn: fetchMessagesForLocale
   }, /*#__PURE__*/React.createElement(ModalTransition, null, /*#__PURE__*/React.createElement(DatasourceModal, {
     testId: "jira-datasource-modal",
-    onClose: onCancel
+    onClose: onCancel,
+    shouldReturnFocus: shouldReturnFocus
   }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

package/dist/esm/ui/assets-modal/search-container/aql-search-input/index.js

@@ -151,9 +151,8 @@ export var AqlSearchInput = function AqlSearchInput(_ref2) {
         className: ax(["_2hwx12x7"])
       })),
       placeholder: formatMessage(searchInputMessages.placeholder),
-      testId: testId
-    }, fg('fix_a11y_issues_inline_edit') && {
-      'aria-label': formatMessage(searchInputMessages.placeholder)
+      testId: testId,
+      "aria-label": formatMessage(searchInputMessages.placeholder)
     })), lastValidationResult.type === 'invalid' && lastValidationResult.error && /*#__PURE__*/React.createElement(ErrorMessage, null, lastValidationResult.error));
   }));
 };

package/dist/esm/ui/common/modal/datasource-modal/index.js

@@ -13,12 +13,14 @@ var ScreenEvent = function ScreenEvent() {
 export var DatasourceModal = function DatasourceModal(_ref) {
   var testId = _ref.testId,
     onClose = _ref.onClose,
-    children = _ref.children;
+    children = _ref.children,
+    _ref$shouldReturnFocu = _ref.shouldReturnFocus,
+    shouldReturnFocus = _ref$shouldReturnFocu === void 0 ? false : _ref$shouldReturnFocu;
   return /*#__PURE__*/React.createElement(Modal, {
     testId: testId,
     onClose: onClose,
     width: "calc(100% - 80px)",
     shouldScrollInViewport: true,
-    shouldReturnFocus: fg('navx-1180-sllv-return-focus-on-escape') ? true : false
+    shouldReturnFocus: fg('navx-1180-sllv-return-focus-on-escape') ? shouldReturnFocus : false
   }, /*#__PURE__*/React.createElement(ScreenEvent, null), children);
 };

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -61,7 +61,8 @@ var isValidParameters = function isValidParameters(parameters) {
 };
 var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var onCancel = props.onCancel,
-    urlBeingEdited = props.url;
+    urlBeingEdited = props.url,
+    shouldReturnFocus = props.shouldReturnFocus;
   var _useDatasourceContext = useDatasourceContext(),
     visibleColumnCount = _useDatasourceContext.visibleColumnCount,
     visibleColumnKeys = _useDatasourceContext.visibleColumnKeys,
@@ -361,7 +362,8 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     loaderFn: fetchMessagesForLocale
   }, /*#__PURE__*/React.createElement(ModalTransition, null, /*#__PURE__*/React.createElement(DatasourceModal, {
     testId: "jira-datasource-modal",
-    onClose: onCancel
+    onClose: onCancel,
+    shouldReturnFocus: shouldReturnFocus
   }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

package/dist/types/common/types.d.ts

@@ -1,3 +1,4 @@
+import type { RefObject } from 'react';
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type IssueLikeDataTableViewProps } from '../ui/issue-like-table/types';
 export type JiraSearchMethod = 'basic' | 'jql';
@@ -7,6 +8,7 @@ export interface Site {
     url: string;
 }
 export type DisplayViewModes = 'table' | 'inline';
+type ShouldReturnFocus = boolean | RefObject<HTMLElement>;
 export type OnInsertFunction<ADF> = (adf: ADF, analyticsEvent?: UIAnalyticsEvent) => void;
 export type ConfigModalProps<ADF, Parameters> = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
@@ -27,4 +29,10 @@ export type ConfigModalProps<ADF, Parameters> = {
     viewMode?: DisplayViewModes;
     /** Disable the view mode display dropdown */
     disableDisplayDropdown?: boolean;
+    /**
+     * Set the focus to return to the element that had focus before focus lock was activated or pass through a specific ref element
+     * Defaults to false, meaning focus remains where it was when the FocusLock was deactivated
+     */
+    shouldReturnFocus?: ShouldReturnFocus;
 } & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'wrappedColumnKeys' | 'columnCustomSizes'>>;
+export {};

package/dist/types/ui/common/modal/datasource-modal/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { type ModalDialogProps } from '@atlaskit/modal-dialog';
-type DatasourceModalProps = Pick<ModalDialogProps, 'testId' | 'onClose' | 'children'>;
-export declare const DatasourceModal: ({ testId, onClose, children }: DatasourceModalProps) => React.JSX.Element;
+type DatasourceModalProps = Pick<ModalDialogProps, 'testId' | 'onClose' | 'children' | 'shouldReturnFocus'>;
+export declare const DatasourceModal: ({ testId, onClose, children, shouldReturnFocus }: DatasourceModalProps) => React.JSX.Element;
 export {};

package/dist/types-ts4.5/common/types.d.ts

@@ -1,3 +1,4 @@
+import type { RefObject } from 'react';
 import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type IssueLikeDataTableViewProps } from '../ui/issue-like-table/types';
 export type JiraSearchMethod = 'basic' | 'jql';
@@ -7,6 +8,7 @@ export interface Site {
     url: string;
 }
 export type DisplayViewModes = 'table' | 'inline';
+type ShouldReturnFocus = boolean | RefObject<HTMLElement>;
 export type OnInsertFunction<ADF> = (adf: ADF, analyticsEvent?: UIAnalyticsEvent) => void;
 export type ConfigModalProps<ADF, Parameters> = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
@@ -27,4 +29,10 @@ export type ConfigModalProps<ADF, Parameters> = {
     viewMode?: DisplayViewModes;
     /** Disable the view mode display dropdown */
     disableDisplayDropdown?: boolean;
+    /**
+     * Set the focus to return to the element that had focus before focus lock was activated or pass through a specific ref element
+     * Defaults to false, meaning focus remains where it was when the FocusLock was deactivated
+     */
+    shouldReturnFocus?: ShouldReturnFocus;
 } & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'wrappedColumnKeys' | 'columnCustomSizes'>>;
+export {};

package/dist/types-ts4.5/ui/common/modal/datasource-modal/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { type ModalDialogProps } from '@atlaskit/modal-dialog';
-type DatasourceModalProps = Pick<ModalDialogProps, 'testId' | 'onClose' | 'children'>;
-export declare const DatasourceModal: ({ testId, onClose, children }: DatasourceModalProps) => React.JSX.Element;
+type DatasourceModalProps = Pick<ModalDialogProps, 'testId' | 'onClose' | 'children' | 'shouldReturnFocus'>;
+export declare const DatasourceModal: ({ testId, onClose, children, shouldReturnFocus }: DatasourceModalProps) => React.JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "4.18.2",
+	"version": "4.19.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -52,7 +52,7 @@
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^27.9.0",
-		"@atlaskit/icon-object": "^7.1.0",
+		"@atlaskit/icon-object": "^7.2.0",
 		"@atlaskit/image": "^3.0.0",
 		"@atlaskit/inline-edit": "^15.3.0",
 		"@atlaskit/intl-messages-provider": "^2.0.0",
@@ -178,9 +178,6 @@
 		"dst-a11y__replace-anchor-with-link__linking-platfo": {
 			"type": "boolean"
 		},
-		"fix_a11y_issues_inline_edit": {
-			"type": "boolean"
-		},
 		"should-render-to-parent-should-be-true-linking-pla": {
 			"type": "boolean"
 		},