@atlaskit/share 4.23.11 → 4.24.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/share
 
+## 4.24.0
+
+### Minor Changes
+
+- [#103086](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103086)
+  [`3d37cc0ea36c7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3d37cc0ea36c7) -
+  add ability to disable the submit button on the share tab and allow additional tabs to be rendered
+  when the slack integration is not provided
+
 ## 4.23.11
 
 ### Patch Changes

package/dist/cjs/components/LazyShareForm/LazyShareForm.js

@@ -79,7 +79,8 @@ function LazyShareForm(props) {
     showTitle = props.showTitle,
     orgId = props.orgId,
     isBrowseUsersDisabled = props.isBrowseUsersDisabled,
-    userPickerOptions = props.userPickerOptions;
+    userPickerOptions = props.userPickerOptions,
+    isSubmitShareDisabled = props.isSubmitShareDisabled;
   var footer = (0, _react2.jsx)("div", null, bottomMessage ? (0, _react2.jsx)("div", {
     css: footerBottomMessageStyles
   }, bottomMessage) : null, customFooter && selectedIntegration === null && (0, _react2.jsx)("div", {
@@ -138,7 +139,8 @@ function LazyShareForm(props) {
     onTabChange: onTabChange,
     onMenuItemChange: onMenuItemChange,
     isBrowseUsersDisabled: isBrowseUsersDisabled,
-    userPickerOptions: userPickerOptions
+    userPickerOptions: userPickerOptions,
+    isSubmitShareDisabled: isSubmitShareDisabled
   }) : (0, _react2.jsx)(_primitives.Text, {
     as: "p"
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.formNoPermissions))));

package/dist/cjs/components/ShareDialogContainer.js

@@ -358,7 +358,8 @@ var ShareDialogContainerInternal = exports.ShareDialogContainerInternal = /*#__P
         copyTooltipText = _this$props2.copyTooltipText,
         onDialogClose = _this$props2.onDialogClose,
         isBrowseUsersDisabled = _this$props2.isBrowseUsersDisabled,
-        userPickerOptions = _this$props2.userPickerOptions;
+        userPickerOptions = _this$props2.userPickerOptions,
+        isSubmitShareDisabled = _this$props2.isSubmitShareDisabled;
       var _this$state = this.state,
         config = _this$state.config,
         isFetchingConfig = _this$state.isFetchingConfig;
@@ -410,7 +411,8 @@ var ShareDialogContainerInternal = exports.ShareDialogContainerInternal = /*#__P
         isBrowseUsersDisabled: isBrowseUsersDisabled,
         userPickerOptions: userPickerOptions,
         additionalTabs: additionalTabs,
-        builtInTabContentWidth: builtInTabContentWidth
+        builtInTabContentWidth: builtInTabContentWidth,
+        isSubmitShareDisabled: isSubmitShareDisabled
       })));
     }
   }]);

package/dist/cjs/components/ShareDialogWithTrigger.js

@@ -557,7 +557,8 @@ var ShareDialogWithTriggerInternal = exports.ShareDialogWithTriggerInternal = /*
         additionalTabs = _this$props7.additionalTabs,
         builtInTabContentWidth = _this$props7.builtInTabContentWidth,
         isBrowseUsersDisabled = _this$props7.isBrowseUsersDisabled,
-        userPickerOptions = _this$props7.userPickerOptions;
+        userPickerOptions = _this$props7.userPickerOptions,
+        isSubmitShareDisabled = _this$props7.isSubmitShareDisabled;
       var style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
         outline: 'none'
       } : undefined;
@@ -609,7 +610,8 @@ var ShareDialogWithTriggerInternal = exports.ShareDialogWithTriggerInternal = /*
               shareIntegrations: shareIntegrations,
               additionalTabs: additionalTabs,
               builtInTabContentWidth: builtInTabContentWidth,
-              isMenuItemSelected: isMenuItemSelected
+              isMenuItemSelected: isMenuItemSelected,
+              isSubmitShareDisabled: isSubmitShareDisabled
               // actions
               ,
               onLinkCopy: _this2.handleCopyLink,

package/dist/cjs/components/ShareForm.js

@@ -204,7 +204,8 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         submitButtonLabel = _this$props2.submitButtonLabel,
         isDisabled = _this$props2.isDisabled,
         isPublicLink = _this$props2.isPublicLink,
-        integrationMode = _this$props2.integrationMode;
+        integrationMode = _this$props2.integrationMode,
+        isSubmitShareDisabled = _this$props2.isSubmitShareDisabled;
       var isRetryableError = !!(shareError !== null && shareError !== void 0 && shareError.retryable);
       var isNonRetryableError = shareError && !shareError.retryable;
       var shouldShowWarning = isRetryableError && !isSharing;
@@ -214,7 +215,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
       var formSendLabel = _i18n.messages.formShare;
       var sendLabel = isPublicLink ? formPublicLabel : formSendLabel;
       var buttonLabel = isRetryableError ? _i18n.messages.formRetry : sendLabel;
-      var buttonDisabled = isDisabled || isNonRetryableError;
+      var buttonDisabled = isDisabled || isNonRetryableError || isSubmitShareDisabled && (0, _platformFeatureFlags.fg)('plans_outgoing_mail_fix');
       var ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : _react.default.Fragment;
       return (0, _react2.jsx)("div", {
         css: submitButtonWrapperStyles
@@ -286,6 +287,111 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         builtInTabContentWidth = _this$props7.builtInTabContentWidth,
         handleCloseDialog = _this$props7.handleCloseDialog;
       var selectedMenuItem = this.state.selectedMenuItem;
+      if ((0, _platformFeatureFlags.fg)('plans_outgoing_mail_fix')) {
+        var hasShareIntegrations = shareIntegrations && shareIntegrations.length;
+        var hasAdditionalTabs = additionalTabs && additionalTabs.length;
+        if (integrationMode === 'off' || !hasShareIntegrations && !hasAdditionalTabs) {
+          return this.renderShareForm();
+        }
+        if (selectedMenuItem === 'default') {
+          return this.renderShareForm();
+        }
+        if (hasShareIntegrations) {
+          var _firstIntegration = shareIntegrations[0];
+          if (selectedMenuItem === 'Slack') {
+            return (0, _react2.jsx)(_IntegrationForm.IntegrationForm, {
+              Content: _firstIntegration.Content,
+              onIntegrationClose: function onIntegrationClose() {
+                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+              }
+            });
+          }
+          if (integrationMode === 'menu') {
+            return (0, _react2.jsx)(_primitives.Box, {
+              xcss: menuGroupContainerStyles
+            }, (0, _react2.jsx)(_menu.MenuGroup, null, (0, _react2.jsx)(_ShareMenuItem.ShareMenuItem, {
+              iconName: (0, _react2.jsx)(_firstIntegration.Icon, null),
+              labelId: _i18n.messages.slackMenuItemText,
+              onClickHandler: function onClickHandler() {
+                return _this2.changeMenuItem('Slack');
+              }
+            }), (0, _react2.jsx)(_ShareMenuItem.ShareMenuItem, {
+              iconName: (0, _react2.jsx)(_email.default, {
+                color: "currentColor",
+                label: "",
+                LEGACY_size: "medium",
+                spacing: "spacious"
+              }),
+              labelId: _i18n.messages.emailMenuItemText,
+              onClickHandler: function onClickHandler() {
+                return _this2.changeMenuItem('default');
+              }
+            })));
+          }
+        }
+        if (integrationMode === 'tabs') {
+          var DEFAULT_TAB_CONTENT_WIDTH = 304;
+          return (0, _react2.jsx)(_tabs.default, {
+            id: "ShareForm-Tabs-Integrations",
+            onChange: this.changeTab,
+            selected: this.state.selectedTab
+          }, (0, _react2.jsx)(_tabs.TabList, null, (0, _react2.jsx)(_tabs.Tab, {
+            key: "share-tab-default"
+          }, this.renderMainTabTitle()), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
+            return (0, _react2.jsx)(_tabs.Tab, {
+              key: "share-tab-".concat(integration.type)
+            }, (0, _react2.jsx)("div", {
+              css: integrationWrapperStyles
+            }, (0, _react2.jsx)("span", {
+              css: integrationIconWrapperStyles
+            }, (0, _react2.jsx)(integration.Icon, null)), integrationTabText(integration.type)));
+          }), (0, _platformFeatureFlags.fg)('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
+            return (0, _react2.jsx)(_tabs.Tab, {
+              key: "share-tab-".concat(tab.label)
+            }, tab.label);
+          }))), (0, _react2.jsx)(_tabs.TabPanel, {
+            key: "share-tabPanel-default"
+          }, (0, _react2.jsx)("div", {
+            css: formWrapperStyles
+          }, (0, _react2.jsx)("div", {
+            style: {
+              width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            }
+          }, this.renderShareForm()))), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
+            return (0, _react2.jsx)(_tabs.TabPanel, {
+              key: "share-tabPanel-integration"
+            }, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
+              data: {
+                source: _analytics.INTEGRATION_MODAL_SOURCE
+              }
+            }, (0, _react2.jsx)("div", {
+              css: formWrapperStyles
+            }, (0, _react2.jsx)("div", {
+              style: {
+                width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+              }
+            }, (0, _react2.jsx)(_IntegrationForm.IntegrationForm, {
+              Content: integration.Content,
+              onIntegrationClose: function onIntegrationClose() {
+                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+              },
+              changeTab: _this2.changeTab
+            })))));
+          }), (0, _platformFeatureFlags.fg)('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
+            return (0, _react2.jsx)(_tabs.TabPanel, {
+              key: "share-tabPanel-".concat(tab.label)
+            }, (0, _react2.jsx)("div", {
+              css: formWrapperStyles
+            }, (0, _react2.jsx)(_IntegrationForm.IntegrationForm, {
+              Content: tab.Content,
+              onIntegrationClose: function onIntegrationClose() {
+                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+              },
+              changeTab: _this2.changeTab
+            })));
+          })));
+        }
+      }
       if (integrationMode === 'off' || !shareIntegrations || !shareIntegrations.length) {
         return this.renderShareForm();
       }
@@ -324,7 +430,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         })));
       }
       if (integrationMode === 'tabs') {
-        var DEFAULT_TAB_CONTENT_WIDTH = 304;
+        var _DEFAULT_TAB_CONTENT_WIDTH = 304;
         return (0, _react2.jsx)(_tabs.default, {
           id: "ShareForm-Tabs-Integrations",
           onChange: this.changeTab,
@@ -347,7 +453,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           css: formWrapperStyles
         }, (0, _react2.jsx)("div", {
           style: {
-            width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
           }
         }, this.renderShareForm()))), (0, _react2.jsx)(_tabs.TabPanel, {
           key: "share-tabPanel-integration"
@@ -359,7 +465,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           css: formWrapperStyles
         }, (0, _react2.jsx)("div", {
           style: {
-            width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
           }
         }, (0, _react2.jsx)(_IntegrationForm.IntegrationForm, {
           Content: firstIntegration.Content,

package/dist/cjs/components/analytics/analytics.js

@@ -13,7 +13,7 @@ var buildAttributes = function buildAttributes() {
   var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return _objectSpread({
     packageName: "@atlaskit/share",
-    packageVersion: "4.23.11"
+    packageVersion: "4.24.0"
   }, attributes);
 };
 var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {

package/dist/es2019/components/LazyShareForm/LazyShareForm.js

@@ -74,7 +74,8 @@ function LazyShareForm(props) {
     showTitle,
     orgId,
     isBrowseUsersDisabled,
-    userPickerOptions
+    userPickerOptions,
+    isSubmitShareDisabled
   } = props;
   const footer = jsx("div", null, bottomMessage ? jsx("div", {
     css: footerBottomMessageStyles
@@ -134,7 +135,8 @@ function LazyShareForm(props) {
     onTabChange: onTabChange,
     onMenuItemChange: onMenuItemChange,
     isBrowseUsersDisabled: isBrowseUsersDisabled,
-    userPickerOptions: userPickerOptions
+    userPickerOptions: userPickerOptions,
+    isSubmitShareDisabled: isSubmitShareDisabled
   }) : jsx(Text, {
     as: "p"
   }, jsx(FormattedMessage, messages.formNoPermissions))));

package/dist/es2019/components/ShareDialogContainer.js

@@ -306,7 +306,8 @@ export class ShareDialogContainerInternal extends React.Component {
       copyTooltipText,
       onDialogClose,
       isBrowseUsersDisabled,
-      userPickerOptions
+      userPickerOptions,
+      isSubmitShareDisabled
     } = this.props;
     const {
       config,
@@ -360,7 +361,8 @@ export class ShareDialogContainerInternal extends React.Component {
       isBrowseUsersDisabled: isBrowseUsersDisabled,
       userPickerOptions: userPickerOptions,
       additionalTabs: additionalTabs,
-      builtInTabContentWidth: builtInTabContentWidth
+      builtInTabContentWidth: builtInTabContentWidth,
+      isSubmitShareDisabled: isSubmitShareDisabled
     })));
   }
 }

package/dist/es2019/components/ShareDialogWithTrigger.js

@@ -505,7 +505,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
       additionalTabs,
       builtInTabContentWidth,
       isBrowseUsersDisabled,
-      userPickerOptions
+      userPickerOptions,
+      isSubmitShareDisabled
     } = this.props;
     const style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
       outline: 'none'
@@ -557,7 +558,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
           shareIntegrations: shareIntegrations,
           additionalTabs: additionalTabs,
           builtInTabContentWidth: builtInTabContentWidth,
-          isMenuItemSelected: isMenuItemSelected
+          isMenuItemSelected: isMenuItemSelected,
+          isSubmitShareDisabled: isSubmitShareDisabled
           // actions
           ,
           onLinkCopy: this.handleCopyLink,

package/dist/es2019/components/ShareForm.js

@@ -185,7 +185,8 @@ class InternalForm extends React.PureComponent {
         submitButtonLabel,
         isDisabled,
         isPublicLink,
-        integrationMode
+        integrationMode,
+        isSubmitShareDisabled
       } = this.props;
       const isRetryableError = !!(shareError !== null && shareError !== void 0 && shareError.retryable);
       const isNonRetryableError = shareError && !shareError.retryable;
@@ -196,7 +197,7 @@ class InternalForm extends React.PureComponent {
       const formSendLabel = messages.formShare;
       const sendLabel = isPublicLink ? formPublicLabel : formSendLabel;
       const buttonLabel = isRetryableError ? messages.formRetry : sendLabel;
-      const buttonDisabled = isDisabled || isNonRetryableError;
+      const buttonDisabled = isDisabled || isNonRetryableError || isSubmitShareDisabled && fg('plans_outgoing_mail_fix');
       const ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : React.Fragment;
       return jsx("div", {
         css: submitButtonWrapperStyles
@@ -269,6 +270,93 @@ class InternalForm extends React.PureComponent {
     const {
       selectedMenuItem
     } = this.state;
+    if (fg('plans_outgoing_mail_fix')) {
+      const hasShareIntegrations = shareIntegrations && shareIntegrations.length;
+      const hasAdditionalTabs = additionalTabs && additionalTabs.length;
+      if (integrationMode === 'off' || !hasShareIntegrations && !hasAdditionalTabs) {
+        return this.renderShareForm();
+      }
+      if (selectedMenuItem === 'default') {
+        return this.renderShareForm();
+      }
+      if (hasShareIntegrations) {
+        const firstIntegration = shareIntegrations[0];
+        if (selectedMenuItem === 'Slack') {
+          return jsx(IntegrationForm, {
+            Content: firstIntegration.Content,
+            onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog()
+          });
+        }
+        if (integrationMode === 'menu') {
+          return jsx(Box, {
+            xcss: menuGroupContainerStyles
+          }, jsx(MenuGroup, null, jsx(ShareMenuItem, {
+            iconName: jsx(firstIntegration.Icon, null),
+            labelId: messages.slackMenuItemText,
+            onClickHandler: () => this.changeMenuItem('Slack')
+          }), jsx(ShareMenuItem, {
+            iconName: jsx(EmailIcon, {
+              color: "currentColor",
+              label: "",
+              LEGACY_size: "medium",
+              spacing: "spacious"
+            }),
+            labelId: messages.emailMenuItemText,
+            onClickHandler: () => this.changeMenuItem('default')
+          })));
+        }
+      }
+      if (integrationMode === 'tabs') {
+        const DEFAULT_TAB_CONTENT_WIDTH = 304;
+        return jsx(Tabs, {
+          id: "ShareForm-Tabs-Integrations",
+          onChange: this.changeTab,
+          selected: this.state.selectedTab
+        }, jsx(TabList, null, jsx(Tab, {
+          key: `share-tab-default`
+        }, this.renderMainTabTitle()), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(integration => jsx(Tab, {
+          key: `share-tab-${integration.type}`
+        }, jsx("div", {
+          css: integrationWrapperStyles
+        }, jsx("span", {
+          css: integrationIconWrapperStyles
+        }, jsx(integration.Icon, null)), integrationTabText(integration.type)))), fg('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => jsx(Tab, {
+          key: `share-tab-${tab.label}`
+        }, tab.label)))), jsx(TabPanel, {
+          key: `share-tabPanel-default`
+        }, jsx("div", {
+          css: formWrapperStyles
+        }, jsx("div", {
+          style: {
+            width: `${builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH}px`
+          }
+        }, this.renderShareForm()))), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(integration => jsx(TabPanel, {
+          key: `share-tabPanel-integration`
+        }, jsx(AnalyticsContext, {
+          data: {
+            source: INTEGRATION_MODAL_SOURCE
+          }
+        }, jsx("div", {
+          css: formWrapperStyles
+        }, jsx("div", {
+          style: {
+            width: `${builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH}px`
+          }
+        }, jsx(IntegrationForm, {
+          Content: integration.Content,
+          onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
+          changeTab: this.changeTab
+        })))))), fg('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => jsx(TabPanel, {
+          key: `share-tabPanel-${tab.label}`
+        }, jsx("div", {
+          css: formWrapperStyles
+        }, jsx(IntegrationForm, {
+          Content: tab.Content,
+          onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
+          changeTab: this.changeTab
+        }))))));
+      }
+    }
     if (integrationMode === 'off' || !shareIntegrations || !shareIntegrations.length) {
       return this.renderShareForm();
     }

package/dist/es2019/components/analytics/analytics.js

@@ -1,7 +1,7 @@
 import { isEmail, isExternalUser, isGroup, isTeam, isUser } from '@atlaskit/smart-user-picker';
 const buildAttributes = (attributes = {}) => ({
   packageName: "@atlaskit/share",
-  packageVersion: "4.23.11",
+  packageVersion: "4.24.0",
   ...attributes
 });
 const createEvent = (eventType, source, action, actionSubject, actionSubjectId, attributes = {}) => ({

package/dist/esm/components/LazyShareForm/LazyShareForm.js

@@ -70,7 +70,8 @@ function LazyShareForm(props) {
     showTitle = props.showTitle,
     orgId = props.orgId,
     isBrowseUsersDisabled = props.isBrowseUsersDisabled,
-    userPickerOptions = props.userPickerOptions;
+    userPickerOptions = props.userPickerOptions,
+    isSubmitShareDisabled = props.isSubmitShareDisabled;
   var footer = jsx("div", null, bottomMessage ? jsx("div", {
     css: footerBottomMessageStyles
   }, bottomMessage) : null, customFooter && selectedIntegration === null && jsx("div", {
@@ -129,7 +130,8 @@ function LazyShareForm(props) {
     onTabChange: onTabChange,
     onMenuItemChange: onMenuItemChange,
     isBrowseUsersDisabled: isBrowseUsersDisabled,
-    userPickerOptions: userPickerOptions
+    userPickerOptions: userPickerOptions,
+    isSubmitShareDisabled: isSubmitShareDisabled
   }) : jsx(Text, {
     as: "p"
   }, jsx(FormattedMessage, messages.formNoPermissions))));

package/dist/esm/components/ShareDialogContainer.js

@@ -351,7 +351,8 @@ export var ShareDialogContainerInternal = /*#__PURE__*/function (_React$Componen
         copyTooltipText = _this$props2.copyTooltipText,
         onDialogClose = _this$props2.onDialogClose,
         isBrowseUsersDisabled = _this$props2.isBrowseUsersDisabled,
-        userPickerOptions = _this$props2.userPickerOptions;
+        userPickerOptions = _this$props2.userPickerOptions,
+        isSubmitShareDisabled = _this$props2.isSubmitShareDisabled;
       var _this$state = this.state,
         config = _this$state.config,
         isFetchingConfig = _this$state.isFetchingConfig;
@@ -403,7 +404,8 @@ export var ShareDialogContainerInternal = /*#__PURE__*/function (_React$Componen
         isBrowseUsersDisabled: isBrowseUsersDisabled,
         userPickerOptions: userPickerOptions,
         additionalTabs: additionalTabs,
-        builtInTabContentWidth: builtInTabContentWidth
+        builtInTabContentWidth: builtInTabContentWidth,
+        isSubmitShareDisabled: isSubmitShareDisabled
       })));
     }
   }]);

package/dist/esm/components/ShareDialogWithTrigger.js

@@ -556,7 +556,8 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
         additionalTabs = _this$props7.additionalTabs,
         builtInTabContentWidth = _this$props7.builtInTabContentWidth,
         isBrowseUsersDisabled = _this$props7.isBrowseUsersDisabled,
-        userPickerOptions = _this$props7.userPickerOptions;
+        userPickerOptions = _this$props7.userPickerOptions,
+        isSubmitShareDisabled = _this$props7.isSubmitShareDisabled;
       var style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
         outline: 'none'
       } : undefined;
@@ -608,7 +609,8 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
               shareIntegrations: shareIntegrations,
               additionalTabs: additionalTabs,
               builtInTabContentWidth: builtInTabContentWidth,
-              isMenuItemSelected: isMenuItemSelected
+              isMenuItemSelected: isMenuItemSelected,
+              isSubmitShareDisabled: isSubmitShareDisabled
               // actions
               ,
               onLinkCopy: _this2.handleCopyLink,

package/dist/esm/components/ShareForm.js

@@ -197,7 +197,8 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         submitButtonLabel = _this$props2.submitButtonLabel,
         isDisabled = _this$props2.isDisabled,
         isPublicLink = _this$props2.isPublicLink,
-        integrationMode = _this$props2.integrationMode;
+        integrationMode = _this$props2.integrationMode,
+        isSubmitShareDisabled = _this$props2.isSubmitShareDisabled;
       var isRetryableError = !!(shareError !== null && shareError !== void 0 && shareError.retryable);
       var isNonRetryableError = shareError && !shareError.retryable;
       var shouldShowWarning = isRetryableError && !isSharing;
@@ -207,7 +208,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
       var formSendLabel = messages.formShare;
       var sendLabel = isPublicLink ? formPublicLabel : formSendLabel;
       var buttonLabel = isRetryableError ? messages.formRetry : sendLabel;
-      var buttonDisabled = isDisabled || isNonRetryableError;
+      var buttonDisabled = isDisabled || isNonRetryableError || isSubmitShareDisabled && fg('plans_outgoing_mail_fix');
       var ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : React.Fragment;
       return jsx("div", {
         css: submitButtonWrapperStyles
@@ -279,6 +280,111 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         builtInTabContentWidth = _this$props7.builtInTabContentWidth,
         handleCloseDialog = _this$props7.handleCloseDialog;
       var selectedMenuItem = this.state.selectedMenuItem;
+      if (fg('plans_outgoing_mail_fix')) {
+        var hasShareIntegrations = shareIntegrations && shareIntegrations.length;
+        var hasAdditionalTabs = additionalTabs && additionalTabs.length;
+        if (integrationMode === 'off' || !hasShareIntegrations && !hasAdditionalTabs) {
+          return this.renderShareForm();
+        }
+        if (selectedMenuItem === 'default') {
+          return this.renderShareForm();
+        }
+        if (hasShareIntegrations) {
+          var _firstIntegration = shareIntegrations[0];
+          if (selectedMenuItem === 'Slack') {
+            return jsx(IntegrationForm, {
+              Content: _firstIntegration.Content,
+              onIntegrationClose: function onIntegrationClose() {
+                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+              }
+            });
+          }
+          if (integrationMode === 'menu') {
+            return jsx(Box, {
+              xcss: menuGroupContainerStyles
+            }, jsx(MenuGroup, null, jsx(ShareMenuItem, {
+              iconName: jsx(_firstIntegration.Icon, null),
+              labelId: messages.slackMenuItemText,
+              onClickHandler: function onClickHandler() {
+                return _this2.changeMenuItem('Slack');
+              }
+            }), jsx(ShareMenuItem, {
+              iconName: jsx(EmailIcon, {
+                color: "currentColor",
+                label: "",
+                LEGACY_size: "medium",
+                spacing: "spacious"
+              }),
+              labelId: messages.emailMenuItemText,
+              onClickHandler: function onClickHandler() {
+                return _this2.changeMenuItem('default');
+              }
+            })));
+          }
+        }
+        if (integrationMode === 'tabs') {
+          var DEFAULT_TAB_CONTENT_WIDTH = 304;
+          return jsx(Tabs, {
+            id: "ShareForm-Tabs-Integrations",
+            onChange: this.changeTab,
+            selected: this.state.selectedTab
+          }, jsx(TabList, null, jsx(Tab, {
+            key: "share-tab-default"
+          }, this.renderMainTabTitle()), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
+            return jsx(Tab, {
+              key: "share-tab-".concat(integration.type)
+            }, jsx("div", {
+              css: integrationWrapperStyles
+            }, jsx("span", {
+              css: integrationIconWrapperStyles
+            }, jsx(integration.Icon, null)), integrationTabText(integration.type)));
+          }), fg('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
+            return jsx(Tab, {
+              key: "share-tab-".concat(tab.label)
+            }, tab.label);
+          }))), jsx(TabPanel, {
+            key: "share-tabPanel-default"
+          }, jsx("div", {
+            css: formWrapperStyles
+          }, jsx("div", {
+            style: {
+              width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            }
+          }, this.renderShareForm()))), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
+            return jsx(TabPanel, {
+              key: "share-tabPanel-integration"
+            }, jsx(AnalyticsContext, {
+              data: {
+                source: INTEGRATION_MODAL_SOURCE
+              }
+            }, jsx("div", {
+              css: formWrapperStyles
+            }, jsx("div", {
+              style: {
+                width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+              }
+            }, jsx(IntegrationForm, {
+              Content: integration.Content,
+              onIntegrationClose: function onIntegrationClose() {
+                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+              },
+              changeTab: _this2.changeTab
+            })))));
+          }), fg('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
+            return jsx(TabPanel, {
+              key: "share-tabPanel-".concat(tab.label)
+            }, jsx("div", {
+              css: formWrapperStyles
+            }, jsx(IntegrationForm, {
+              Content: tab.Content,
+              onIntegrationClose: function onIntegrationClose() {
+                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+              },
+              changeTab: _this2.changeTab
+            })));
+          })));
+        }
+      }
       if (integrationMode === 'off' || !shareIntegrations || !shareIntegrations.length) {
         return this.renderShareForm();
       }
@@ -317,7 +423,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         })));
       }
       if (integrationMode === 'tabs') {
-        var DEFAULT_TAB_CONTENT_WIDTH = 304;
+        var _DEFAULT_TAB_CONTENT_WIDTH = 304;
         return jsx(Tabs, {
           id: "ShareForm-Tabs-Integrations",
           onChange: this.changeTab,
@@ -340,7 +446,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           css: formWrapperStyles
         }, jsx("div", {
           style: {
-            width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
           }
         }, this.renderShareForm()))), jsx(TabPanel, {
           key: "share-tabPanel-integration"
@@ -352,7 +458,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           css: formWrapperStyles
         }, jsx("div", {
           style: {
-            width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
           }
         }, jsx(IntegrationForm, {
           Content: firstIntegration.Content,

package/dist/esm/components/analytics/analytics.js

@@ -6,7 +6,7 @@ var buildAttributes = function buildAttributes() {
   var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return _objectSpread({
     packageName: "@atlaskit/share",
-    packageVersion: "4.23.11"
+    packageVersion: "4.24.0"
   }, attributes);
 };
 var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {

package/dist/types/components/LazyShareForm/LazyShareForm.d.ts

@@ -2,7 +2,7 @@ import { jsx } from '@emotion/react';
 import type { LoadOptions } from '@atlaskit/smart-user-picker';
 import type { MenuType, ShareData, ShareDialogWithTriggerProps, ShareDialogWithTriggerStates } from '../../types';
 import { type IntegrationFormProps } from '../IntegrationForm';
-export type LazyShareFormProps = Pick<ShareDialogWithTriggerProps, 'copyLink' | 'config' | 'isFetchingConfig' | 'loadUserOptions' | 'shareFormTitle' | 'shareFormHelperMessage' | 'bottomMessage' | 'submitButtonLabel' | 'product' | 'productAttributes' | 'customFooter' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'cloudId' | 'shareFieldsFooter' | 'onUserSelectionChange' | 'isPublicLink' | 'copyTooltipText' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'integrationMode' | 'onDialogClose' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions' | 'isMenuItemSelected'> & Pick<ShareDialogWithTriggerStates, 'showIntegrationForm' | 'selectedIntegration' | 'isSharing' | 'shareError' | 'defaultValue'> & Pick<IntegrationFormProps, 'Content'> & {
+export type LazyShareFormProps = Pick<ShareDialogWithTriggerProps, 'copyLink' | 'config' | 'isFetchingConfig' | 'loadUserOptions' | 'shareFormTitle' | 'shareFormHelperMessage' | 'bottomMessage' | 'submitButtonLabel' | 'product' | 'productAttributes' | 'customFooter' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'cloudId' | 'shareFieldsFooter' | 'onUserSelectionChange' | 'isPublicLink' | 'copyTooltipText' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'integrationMode' | 'onDialogClose' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions' | 'isMenuItemSelected' | 'isSubmitShareDisabled'> & Pick<ShareDialogWithTriggerStates, 'showIntegrationForm' | 'selectedIntegration' | 'isSharing' | 'shareError' | 'defaultValue'> & Pick<IntegrationFormProps, 'Content'> & {
     onLinkCopy: () => void;
     onDismiss: (data: ShareData) => void;
     onSubmit: (data: ShareData) => void;

package/dist/types/types/ShareDialogContainer.d.ts

@@ -156,4 +156,5 @@ export type ShareDialogContainerProps = {
     copyTooltipText?: string;
     isBrowseUsersDisabled?: boolean;
     workspaceAri?: string;
+    isSubmitShareDisabled?: boolean;
 };

package/dist/types/types/ShareDialogWithTrigger.d.ts

@@ -19,7 +19,7 @@ export type DialogPlacement = Placement;
  * with the demo page and clearly visible options on that page.
  */
 export type DialogBoundariesElement = 'viewport' | 'window' | 'scrollParent';
-export type ShareDialogWithTriggerProps = Pick<ShareDialogContainerProps, 'onTriggerButtonClick' | 'isAutoOpenDialog' | 'shouldCloseOnEscapePress' | 'dialogPlacement' | 'loadUserOptions' | 'onDialogOpen' | 'onDialogClose' | 'onUserSelectionChange' | 'renderCustomTriggerButton' | 'shareContentType' | 'shareContentSubType' | 'shareContentId' | 'shareFormTitle' | 'shareFormHelperMessage' | 'showFlags' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'triggerButtonAppearance' | 'triggerButtonIcon' | 'triggerButtonStyle' | 'triggerButtonTooltipPosition' | 'triggerButtonTooltipText' | 'cloudId' | 'bottomMessage' | 'product' | 'productAttributes' | 'customFooter' | 'isCopyDisabled' | 'isPublicLink' | 'integrationMode' | 'isMenuItemSelected' | 'shareFieldsFooter' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'shareAri' | 'tabIndex' | 'copyTooltipText' | 'dialogZIndex' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions'> & {
+export type ShareDialogWithTriggerProps = Pick<ShareDialogContainerProps, 'onTriggerButtonClick' | 'isAutoOpenDialog' | 'shouldCloseOnEscapePress' | 'dialogPlacement' | 'loadUserOptions' | 'onDialogOpen' | 'onDialogClose' | 'onUserSelectionChange' | 'renderCustomTriggerButton' | 'shareContentType' | 'shareContentSubType' | 'shareContentId' | 'shareFormTitle' | 'shareFormHelperMessage' | 'showFlags' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'triggerButtonAppearance' | 'triggerButtonIcon' | 'triggerButtonStyle' | 'triggerButtonTooltipPosition' | 'triggerButtonTooltipText' | 'cloudId' | 'bottomMessage' | 'product' | 'productAttributes' | 'customFooter' | 'isCopyDisabled' | 'isPublicLink' | 'integrationMode' | 'isMenuItemSelected' | 'shareFieldsFooter' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'shareAri' | 'tabIndex' | 'copyTooltipText' | 'dialogZIndex' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions' | 'isSubmitShareDisabled'> & {
     config?: ConfigResponse;
     isFetchingConfig?: boolean;
     children?: RenderCustomTriggerButton;

package/dist/types/types/ShareForm.d.ts

@@ -31,4 +31,5 @@ export type ShareFormProps = Pick<ShareDialogContainerProps, 'integrationMode' |
     selectedMenuItem?: number;
     Content?: React.ReactNode;
     handleCloseDialog?: () => void;
+    isSubmitShareDisabled?: boolean;
 };

package/dist/types-ts4.5/components/LazyShareForm/LazyShareForm.d.ts

@@ -2,7 +2,7 @@ import { jsx } from '@emotion/react';
 import type { LoadOptions } from '@atlaskit/smart-user-picker';
 import type { MenuType, ShareData, ShareDialogWithTriggerProps, ShareDialogWithTriggerStates } from '../../types';
 import { type IntegrationFormProps } from '../IntegrationForm';
-export type LazyShareFormProps = Pick<ShareDialogWithTriggerProps, 'copyLink' | 'config' | 'isFetchingConfig' | 'loadUserOptions' | 'shareFormTitle' | 'shareFormHelperMessage' | 'bottomMessage' | 'submitButtonLabel' | 'product' | 'productAttributes' | 'customFooter' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'cloudId' | 'shareFieldsFooter' | 'onUserSelectionChange' | 'isPublicLink' | 'copyTooltipText' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'integrationMode' | 'onDialogClose' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions' | 'isMenuItemSelected'> & Pick<ShareDialogWithTriggerStates, 'showIntegrationForm' | 'selectedIntegration' | 'isSharing' | 'shareError' | 'defaultValue'> & Pick<IntegrationFormProps, 'Content'> & {
+export type LazyShareFormProps = Pick<ShareDialogWithTriggerProps, 'copyLink' | 'config' | 'isFetchingConfig' | 'loadUserOptions' | 'shareFormTitle' | 'shareFormHelperMessage' | 'bottomMessage' | 'submitButtonLabel' | 'product' | 'productAttributes' | 'customFooter' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'cloudId' | 'shareFieldsFooter' | 'onUserSelectionChange' | 'isPublicLink' | 'copyTooltipText' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'integrationMode' | 'onDialogClose' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions' | 'isMenuItemSelected' | 'isSubmitShareDisabled'> & Pick<ShareDialogWithTriggerStates, 'showIntegrationForm' | 'selectedIntegration' | 'isSharing' | 'shareError' | 'defaultValue'> & Pick<IntegrationFormProps, 'Content'> & {
     onLinkCopy: () => void;
     onDismiss: (data: ShareData) => void;
     onSubmit: (data: ShareData) => void;

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

@@ -156,4 +156,5 @@ export type ShareDialogContainerProps = {
     copyTooltipText?: string;
     isBrowseUsersDisabled?: boolean;
     workspaceAri?: string;
+    isSubmitShareDisabled?: boolean;
 };

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

@@ -19,7 +19,7 @@ export type DialogPlacement = Placement;
  * with the demo page and clearly visible options on that page.
  */
 export type DialogBoundariesElement = 'viewport' | 'window' | 'scrollParent';
-export type ShareDialogWithTriggerProps = Pick<ShareDialogContainerProps, 'onTriggerButtonClick' | 'isAutoOpenDialog' | 'shouldCloseOnEscapePress' | 'dialogPlacement' | 'loadUserOptions' | 'onDialogOpen' | 'onDialogClose' | 'onUserSelectionChange' | 'renderCustomTriggerButton' | 'shareContentType' | 'shareContentSubType' | 'shareContentId' | 'shareFormTitle' | 'shareFormHelperMessage' | 'showFlags' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'triggerButtonAppearance' | 'triggerButtonIcon' | 'triggerButtonStyle' | 'triggerButtonTooltipPosition' | 'triggerButtonTooltipText' | 'cloudId' | 'bottomMessage' | 'product' | 'productAttributes' | 'customFooter' | 'isCopyDisabled' | 'isPublicLink' | 'integrationMode' | 'isMenuItemSelected' | 'shareFieldsFooter' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'shareAri' | 'tabIndex' | 'copyTooltipText' | 'dialogZIndex' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions'> & {
+export type ShareDialogWithTriggerProps = Pick<ShareDialogContainerProps, 'onTriggerButtonClick' | 'isAutoOpenDialog' | 'shouldCloseOnEscapePress' | 'dialogPlacement' | 'loadUserOptions' | 'onDialogOpen' | 'onDialogClose' | 'onUserSelectionChange' | 'renderCustomTriggerButton' | 'shareContentType' | 'shareContentSubType' | 'shareContentId' | 'shareFormTitle' | 'shareFormHelperMessage' | 'showFlags' | 'enableSmartUserPicker' | 'loggedInAccountId' | 'triggerButtonAppearance' | 'triggerButtonIcon' | 'triggerButtonStyle' | 'triggerButtonTooltipPosition' | 'triggerButtonTooltipText' | 'cloudId' | 'bottomMessage' | 'product' | 'productAttributes' | 'customFooter' | 'isCopyDisabled' | 'isPublicLink' | 'integrationMode' | 'isMenuItemSelected' | 'shareFieldsFooter' | 'shareIntegrations' | 'additionalTabs' | 'builtInTabContentWidth' | 'shareAri' | 'tabIndex' | 'copyTooltipText' | 'dialogZIndex' | 'orgId' | 'isBrowseUsersDisabled' | 'userPickerOptions' | 'isSubmitShareDisabled'> & {
     config?: ConfigResponse;
     isFetchingConfig?: boolean;
     children?: RenderCustomTriggerButton;

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

@@ -31,4 +31,5 @@ export type ShareFormProps = Pick<ShareDialogContainerProps, 'integrationMode' |
     selectedMenuItem?: number;
     Content?: React.ReactNode;
     handleCloseDialog?: () => void;
+    isSubmitShareDisabled?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/share",
-	"version": "4.23.11",
+	"version": "4.24.0",
 	"description": "Fabric Share Element",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -43,7 +43,7 @@
 		"@atlaskit/dropdown-menu": "^12.24.0",
 		"@atlaskit/form": "^11.0.0",
 		"@atlaskit/heading": "^4.0.0",
-		"@atlaskit/icon": "^23.3.0",
+		"@atlaskit/icon": "^23.4.0",
 		"@atlaskit/link": "^2.0.0",
 		"@atlaskit/menu": "^2.13.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/tabs": "^17.0.0",
 		"@atlaskit/textarea": "^5.7.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^3.0.0",
+		"@atlaskit/tokens": "^3.1.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/user-picker": "^10.29.0",
@@ -123,6 +123,9 @@
 		},
 		"smart_links_for_plans_platform": {
 			"type": "boolean"
+		},
+		"plans_outgoing_mail_fix": {
+			"type": "boolean"
 		}
 	}
 }