@atlaskit/share 6.6.2 → 6.7.0

package/dist/cjs/components/ShareFormNext.js

@@ -170,7 +170,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 || isSubmitShareDisabled && (0, _platformFeatureFlags.fg)('plans_outgoing_mail_fix');
+      var buttonDisabled = isDisabled || isNonRetryableError || isSubmitShareDisabled;
       var ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : _react.default.Fragment;
       return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
         xcss: (0, _css.cx)(styles.submitButtonWrapperStyles)
@@ -242,167 +242,66 @@ 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 /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
-              Content: _firstIntegration.Content,
-              onIntegrationClose: function onIntegrationClose() {
-                return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
-              }
-            });
-          }
-          if (integrationMode === 'menu') {
-            return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-              xcss: (0, _css.cx)(styles.menuGroupContainerStyles),
-              backgroundColor: "elevation.surface.overlay"
-            }, /*#__PURE__*/_react.default.createElement(_menu.MenuGroup, null, /*#__PURE__*/_react.default.createElement(_ShareMenuItem.ShareMenuItem, {
-              iconName: /*#__PURE__*/_react.default.createElement(_firstIntegration.Icon, null),
-              labelId: _i18n.messages.slackMenuItemText,
-              onClickHandler: function onClickHandler() {
-                return _this2.changeMenuItem('Slack');
-              }
-            }), /*#__PURE__*/_react.default.createElement(_ShareMenuItem.ShareMenuItem, {
-              iconName: /*#__PURE__*/_react.default.createElement(_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 /*#__PURE__*/_react.default.createElement(_tabs.default, {
-            id: "ShareForm-Tabs-Integrations",
-            onChange: this.changeTab,
-            selected: this.state.selectedTab
-          }, /*#__PURE__*/_react.default.createElement(_tabs.TabList, null, /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
-            key: "share-tab-default"
-          }, this.renderMainTabTitle()), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
-            return /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
-              key: "share-tab-".concat(integration.type)
-            }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-              xcss: (0, _css.cx)(styles.integrationWrapperStyles)
-            }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-              as: "span",
-              xcss: (0, _css.cx)(styles.integrationIconWrapperStyles)
-            }, /*#__PURE__*/_react.default.createElement(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 /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
-              key: "share-tab-".concat(tab.label)
-            }, tab.label);
-          }))), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
-            key: "share-tabPanel-default"
-          }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-            xcss: (0, _css.cx)(styles.formWrapperStyles)
-          }, /*#__PURE__*/_react.default.createElement("div", {
-            style: {
-              width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
-            }
-          }, this.renderShareForm()))), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
-            return /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
-              key: "share-tabPanel-integration"
-            }, /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
-              data: {
-                source: _analytics.INTEGRATION_MODAL_SOURCE
-              }
-            }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-              xcss: (0, _css.cx)(styles.formWrapperStyles)
-            }, /*#__PURE__*/_react.default.createElement("div", {
-              style: {
-                width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
-              }
-            }, /*#__PURE__*/_react.default.createElement(_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 /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
-              key: "share-tabPanel-".concat(tab.label)
-            }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-              xcss: (0, _css.cx)(styles.formWrapperStyles)
-            }, /*#__PURE__*/_react.default.createElement(_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) {
+      var hasShareIntegrations = shareIntegrations && shareIntegrations.length;
+      var hasAdditionalTabs = additionalTabs && additionalTabs.length;
+      if (integrationMode === 'off' || !hasShareIntegrations && !hasAdditionalTabs) {
         return this.renderShareForm();
       }
-      var firstIntegration = shareIntegrations[0];
       if (selectedMenuItem === 'default') {
         return this.renderShareForm();
       }
-      if (selectedMenuItem === 'Slack') {
-        return /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
-          Content: firstIntegration.Content,
-          onIntegrationClose: function onIntegrationClose() {
-            return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
-          }
-        });
-      }
-      if (integrationMode === 'menu') {
-        return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-          xcss: (0, _css.cx)(styles.menuGroupContainerStyles),
-          backgroundColor: "elevation.surface.overlay"
-        }, /*#__PURE__*/_react.default.createElement(_menu.MenuGroup, null, /*#__PURE__*/_react.default.createElement(_ShareMenuItem.ShareMenuItem, {
-          iconName: /*#__PURE__*/_react.default.createElement(firstIntegration.Icon, null),
-          labelId: _i18n.messages.slackMenuItemText,
-          onClickHandler: function onClickHandler() {
-            return _this2.changeMenuItem('Slack');
-          }
-        }), /*#__PURE__*/_react.default.createElement(_ShareMenuItem.ShareMenuItem, {
-          iconName: /*#__PURE__*/_react.default.createElement(_email.default, {
-            color: "currentColor",
-            label: "",
-            LEGACY_size: "medium",
-            spacing: "spacious"
-          }),
-          labelId: _i18n.messages.emailMenuItemText,
-          onClickHandler: function onClickHandler() {
-            return _this2.changeMenuItem('default');
-          }
-        })));
+      if (hasShareIntegrations) {
+        var firstIntegration = shareIntegrations[0];
+        if (selectedMenuItem === 'Slack') {
+          return /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
+            Content: firstIntegration.Content,
+            onIntegrationClose: function onIntegrationClose() {
+              return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
+            }
+          });
+        }
+        if (integrationMode === 'menu') {
+          return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+            xcss: (0, _css.cx)(styles.menuGroupContainerStyles),
+            backgroundColor: "elevation.surface.overlay"
+          }, /*#__PURE__*/_react.default.createElement(_menu.MenuGroup, null, /*#__PURE__*/_react.default.createElement(_ShareMenuItem.ShareMenuItem, {
+            iconName: /*#__PURE__*/_react.default.createElement(firstIntegration.Icon, null),
+            labelId: _i18n.messages.slackMenuItemText,
+            onClickHandler: function onClickHandler() {
+              return _this2.changeMenuItem('Slack');
+            }
+          }), /*#__PURE__*/_react.default.createElement(_ShareMenuItem.ShareMenuItem, {
+            iconName: /*#__PURE__*/_react.default.createElement(_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;
+        var DEFAULT_TAB_CONTENT_WIDTH = 304;
         return /*#__PURE__*/_react.default.createElement(_tabs.default, {
           id: "ShareForm-Tabs-Integrations",
           onChange: this.changeTab,
           selected: this.state.selectedTab
         }, /*#__PURE__*/_react.default.createElement(_tabs.TabList, null, /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
           key: "share-tab-default"
-        }, this.renderMainTabTitle()), /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
-          key: "share-tab-".concat(firstIntegration.type)
-        }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-          xcss: (0, _css.cx)(styles.integrationWrapperStyles)
-        }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-          as: "span",
-          xcss: (0, _css.cx)(styles.integrationIconWrapperStyles)
-        }, /*#__PURE__*/_react.default.createElement(firstIntegration.Icon, null)), integrationTabText(firstIntegration.type))), (0, _platformFeatureFlags.fg)('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
+        }, this.renderMainTabTitle()), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
+          return /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
+            key: "share-tab-".concat(integration.type)
+          }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+            xcss: (0, _css.cx)(styles.integrationWrapperStyles)
+          }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+            as: "span",
+            xcss: (0, _css.cx)(styles.integrationIconWrapperStyles)
+          }, /*#__PURE__*/_react.default.createElement(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 /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
             key: "share-tab-".concat(tab.label)
           }, tab.label);
@@ -412,27 +311,29 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           xcss: (0, _css.cx)(styles.formWrapperStyles)
         }, /*#__PURE__*/_react.default.createElement("div", {
           style: {
-            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
-          }
-        }, this.renderShareForm()))), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
-          key: "share-tabPanel-integration"
-        }, /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
-          data: {
-            source: _analytics.INTEGRATION_MODAL_SOURCE
+            width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
           }
-        }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-          xcss: (0, _css.cx)(styles.formWrapperStyles)
-        }, /*#__PURE__*/_react.default.createElement("div", {
-          style: {
-            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
-          }
-        }, /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
-          Content: firstIntegration.Content,
-          onIntegrationClose: function onIntegrationClose() {
-            return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
-          },
-          changeTab: this.changeTab
-        }))))), (0, _platformFeatureFlags.fg)('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
+        }, this.renderShareForm()))), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(function (integration) {
+          return /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
+            key: "share-tabPanel-integration"
+          }, /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
+            data: {
+              source: _analytics.INTEGRATION_MODAL_SOURCE
+            }
+          }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+            xcss: (0, _css.cx)(styles.formWrapperStyles)
+          }, /*#__PURE__*/_react.default.createElement("div", {
+            style: {
+              width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
+            }
+          }, /*#__PURE__*/_react.default.createElement(_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 /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
             key: "share-tabPanel-".concat(tab.label)
           }, /*#__PURE__*/_react.default.createElement(_compiled.Box, {

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: "6.6.2"
+    packageVersion: "6.7.0"
   }, attributes);
 };
 var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {

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

@@ -82,7 +82,8 @@ function LazyShareForm(props) {
     userPickerOptions,
     isSubmitShareDisabled,
     additionalUserFields,
-    isExtendedShareDialogEnabled
+    isExtendedShareDialogEnabled,
+    CustomSubmitButton
   } = props;
   const header = customHeader ? jsx("div", {
     css: headerCustomStyles
@@ -150,7 +151,8 @@ function LazyShareForm(props) {
     userPickerOptions: userPickerOptions,
     isSubmitShareDisabled: isSubmitShareDisabled,
     additionalUserFields: additionalUserFields,
-    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+    CustomSubmitButton: CustomSubmitButton
   }) : jsx(Text, {
     as: "p"
   }, jsx(FormattedMessage, messages.formNoPermissions))));

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

@@ -71,7 +71,8 @@ function LazyShareForm(props) {
     userPickerOptions,
     isSubmitShareDisabled,
     additionalUserFields,
-    isExtendedShareDialogEnabled
+    isExtendedShareDialogEnabled,
+    CustomSubmitButton
   } = props;
   const header = customHeader ? /*#__PURE__*/React.createElement(Box, {
     xcss: styles.headerCustomStyles
@@ -139,7 +140,8 @@ function LazyShareForm(props) {
     userPickerOptions: userPickerOptions,
     isSubmitShareDisabled: isSubmitShareDisabled,
     additionalUserFields: additionalUserFields,
-    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+    CustomSubmitButton: CustomSubmitButton
   }) : /*#__PURE__*/React.createElement(Text, {
     as: "p"
   }, /*#__PURE__*/React.createElement(FormattedMessage, messages.formNoPermissions))));

package/dist/es2019/components/ShareDialogContainer.js

@@ -318,7 +318,8 @@ export class ShareDialogContainerInternal extends React.Component {
       userPickerOptions,
       isSubmitShareDisabled,
       additionalUserFields,
-      isExtendedShareDialogEnabled
+      isExtendedShareDialogEnabled,
+      CustomSubmitButton
     } = this.props;
     const {
       config,
@@ -376,7 +377,8 @@ export class ShareDialogContainerInternal extends React.Component {
       builtInTabContentWidth: builtInTabContentWidth,
       isSubmitShareDisabled: isSubmitShareDisabled,
       additionalUserFields: additionalUserFields,
-      isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+      isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+      CustomSubmitButton: CustomSubmitButton
     })));
   }
 }

package/dist/es2019/components/ShareDialogWithTrigger.js

@@ -526,7 +526,8 @@ export class ShareDialogWithTriggerInternalLegacy extends React.PureComponent {
       userPickerOptions,
       isSubmitShareDisabled,
       additionalUserFields,
-      isExtendedShareDialogEnabled
+      isExtendedShareDialogEnabled,
+      CustomSubmitButton
     } = this.props;
     const style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
       outline: 'none'
@@ -595,7 +596,8 @@ export class ShareDialogWithTriggerInternalLegacy extends React.PureComponent {
           isBrowseUsersDisabled: isBrowseUsersDisabled,
           userPickerOptions: userPickerOptions,
           additionalUserFields: additionalUserFields,
-          isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+          isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+          CustomSubmitButton: CustomSubmitButton
         })),
         isOpen: isDialogOpen,
         onClose: this.handleCloseDialog,

package/dist/es2019/components/ShareDialogWithTriggerNext.js

@@ -503,7 +503,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
       userPickerOptions,
       isSubmitShareDisabled,
       additionalUserFields,
-      isExtendedShareDialogEnabled
+      isExtendedShareDialogEnabled,
+      CustomSubmitButton
     } = this.props;
     const footer = resolveShareFooter(integrationMode, this.state.tabIndex, customFooter);
 
@@ -564,7 +565,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
         isBrowseUsersDisabled: isBrowseUsersDisabled,
         userPickerOptions: userPickerOptions,
         additionalUserFields: additionalUserFields,
-        isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+        isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+        CustomSubmitButton: CustomSubmitButton
       })),
       isOpen: isDialogOpen,
       onClose: this.handleCloseDialog,

package/dist/es2019/components/ShareForm.js

@@ -135,7 +135,10 @@ class InternalForm extends React.PureComponent {
         userPickerOptions,
         productAttributes,
         additionalUserFields,
-        isExtendedShareDialogEnabled
+        isExtendedShareDialogEnabled,
+        isSharing,
+        isSubmitShareDisabled,
+        CustomSubmitButton
       } = this.props;
       return jsx(AnalyticsContext, {
         data: {
@@ -203,7 +206,13 @@ class InternalForm extends React.PureComponent {
         copyTooltipText: copyTooltipText,
         copyLinkButtonText: formatMessage(isPublicLink ? messages.copyPublicLinkButtonText : messages.copyLinkButtonText),
         copiedToClipboardText: formatMessage(messages.copiedToClipboardMessage)
-      }), this.renderSubmitButton())));
+      }), isExtendedShareDialogEnabled && CustomSubmitButton ? jsx(CustomSubmitButton, {
+        shareError: shareError,
+        isSharing: isSharing,
+        isDisabled: isDisabled,
+        isSubmitShareDisabled: isSubmitShareDisabled,
+        isPublicLink: isPublicLink
+      }) : this.renderSubmitButton())));
     });
     _defineProperty(this, "renderSubmitButton", () => {
       const {
@@ -227,7 +236,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 || isSubmitShareDisabled && fg('plans_outgoing_mail_fix');
+      const buttonDisabled = isDisabled || isNonRetryableError || isSubmitShareDisabled;
       const ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : React.Fragment;
       return jsx("div", {
         css: submitButtonWrapperStyles
@@ -301,123 +310,40 @@ 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 = isExtendedShareDialogEnabled ? 452 : 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) {
+    const hasShareIntegrations = shareIntegrations && shareIntegrations.length;
+    const hasAdditionalTabs = additionalTabs && additionalTabs.length;
+    if (integrationMode === 'off' || !hasShareIntegrations && !hasAdditionalTabs) {
       return this.renderShareForm();
     }
-    const firstIntegration = shareIntegrations[0];
     if (selectedMenuItem === 'default') {
       return this.renderShareForm();
     }
-    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 (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 = isExtendedShareDialogEnabled ? 452 : 304;
@@ -427,13 +353,13 @@ class InternalForm extends React.PureComponent {
         selected: this.state.selectedTab
       }, jsx(TabList, null, jsx(Tab, {
         key: `share-tab-default`
-      }, this.renderMainTabTitle()), jsx(Tab, {
-        key: `share-tab-${firstIntegration.type}`
+      }, 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(firstIntegration.Icon, null)), integrationTabText(firstIntegration.type))), fg('smart_links_for_plans_platform') && (additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => jsx(Tab, {
+      }, 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`
@@ -443,7 +369,7 @@ class InternalForm extends React.PureComponent {
         style: {
           width: `${builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH}px`
         }
-      }, this.renderShareForm()))), jsx(TabPanel, {
+      }, this.renderShareForm()))), shareIntegrations === null || shareIntegrations === void 0 ? void 0 : shareIntegrations.map(integration => jsx(TabPanel, {
         key: `share-tabPanel-integration`
       }, jsx(AnalyticsContext, {
         data: {
@@ -456,10 +382,10 @@ class InternalForm extends React.PureComponent {
           width: `${builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH}px`
         }
       }, jsx(IntegrationForm, {
-        Content: firstIntegration.Content,
+        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, {
+      })))))), 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