@atlaskit/share 6.6.2 → 6.7.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/share
 
+## 6.7.0
+
+### Minor Changes
+
+- [#159242](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159242)
+  [`d465c0632984c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d465c0632984c) -
+  [ux] Exposing a new `CustomSubmitButton` prop to control behaviour of share form submit button.
+  This is only used when the extended share dialog is enabled.
+
+## 6.6.3
+
+### Patch Changes
+
+- [#160514](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/160514)
+  [`106f4550f0e10`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/106f4550f0e10) -
+  clean outgoing mail fix feature gate
+- Updated dependencies
+
 ## 6.6.2
 
 ### Patch Changes

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

@@ -87,7 +87,8 @@ function LazyShareForm(props) {
     userPickerOptions = props.userPickerOptions,
     isSubmitShareDisabled = props.isSubmitShareDisabled,
     additionalUserFields = props.additionalUserFields,
-    isExtendedShareDialogEnabled = props.isExtendedShareDialogEnabled;
+    isExtendedShareDialogEnabled = props.isExtendedShareDialogEnabled,
+    CustomSubmitButton = props.CustomSubmitButton;
   var header = customHeader ? (0, _react2.jsx)("div", {
     css: headerCustomStyles
   }, customHeader) : null;
@@ -154,7 +155,8 @@ function LazyShareForm(props) {
     userPickerOptions: userPickerOptions,
     isSubmitShareDisabled: isSubmitShareDisabled,
     additionalUserFields: additionalUserFields,
-    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+    CustomSubmitButton: CustomSubmitButton
   }) : (0, _react2.jsx)(_compiled.Text, {
     as: "p"
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _i18n.messages.formNoPermissions))));

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

@@ -74,7 +74,8 @@ function LazyShareForm(props) {
     userPickerOptions = props.userPickerOptions,
     isSubmitShareDisabled = props.isSubmitShareDisabled,
     additionalUserFields = props.additionalUserFields,
-    isExtendedShareDialogEnabled = props.isExtendedShareDialogEnabled;
+    isExtendedShareDialogEnabled = props.isExtendedShareDialogEnabled,
+    CustomSubmitButton = props.CustomSubmitButton;
   var header = customHeader ? /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     xcss: styles.headerCustomStyles
   }, customHeader) : null;
@@ -141,7 +142,8 @@ function LazyShareForm(props) {
     userPickerOptions: userPickerOptions,
     isSubmitShareDisabled: isSubmitShareDisabled,
     additionalUserFields: additionalUserFields,
-    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+    isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+    CustomSubmitButton: CustomSubmitButton
   }) : /*#__PURE__*/_react.default.createElement(_compiled.Text, {
     as: "p"
   }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _i18n.messages.formNoPermissions))));

package/dist/cjs/components/ShareDialogContainer.js

@@ -371,7 +371,8 @@ var ShareDialogContainerInternal = exports.ShareDialogContainerInternal = /*#__P
         userPickerOptions = _this$props3.userPickerOptions,
         isSubmitShareDisabled = _this$props3.isSubmitShareDisabled,
         additionalUserFields = _this$props3.additionalUserFields,
-        isExtendedShareDialogEnabled = _this$props3.isExtendedShareDialogEnabled;
+        isExtendedShareDialogEnabled = _this$props3.isExtendedShareDialogEnabled,
+        CustomSubmitButton = _this$props3.CustomSubmitButton;
       var _this$state = this.state,
         config = _this$state.config,
         isFetchingConfig = _this$state.isFetchingConfig;
@@ -427,7 +428,8 @@ var ShareDialogContainerInternal = exports.ShareDialogContainerInternal = /*#__P
         builtInTabContentWidth: builtInTabContentWidth,
         isSubmitShareDisabled: isSubmitShareDisabled,
         additionalUserFields: additionalUserFields,
-        isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+        isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+        CustomSubmitButton: CustomSubmitButton
       })));
     }
   }]);

package/dist/cjs/components/ShareDialogWithTrigger.js

@@ -578,7 +578,8 @@ var ShareDialogWithTriggerInternalLegacy = exports.ShareDialogWithTriggerInterna
         userPickerOptions = _this$props7.userPickerOptions,
         isSubmitShareDisabled = _this$props7.isSubmitShareDisabled,
         additionalUserFields = _this$props7.additionalUserFields,
-        isExtendedShareDialogEnabled = _this$props7.isExtendedShareDialogEnabled;
+        isExtendedShareDialogEnabled = _this$props7.isExtendedShareDialogEnabled,
+        CustomSubmitButton = _this$props7.CustomSubmitButton;
       var style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
         outline: 'none'
       } : undefined;
@@ -647,7 +648,8 @@ var ShareDialogWithTriggerInternalLegacy = exports.ShareDialogWithTriggerInterna
               isBrowseUsersDisabled: isBrowseUsersDisabled,
               userPickerOptions: userPickerOptions,
               additionalUserFields: additionalUserFields,
-              isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+              isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+              CustomSubmitButton: CustomSubmitButton
             }));
           },
           isOpen: isDialogOpen,

package/dist/cjs/components/ShareDialogWithTriggerNext.js

@@ -561,7 +561,8 @@ var ShareDialogWithTriggerInternal = exports.ShareDialogWithTriggerInternal = /*
         userPickerOptions = _this$props7.userPickerOptions,
         isSubmitShareDisabled = _this$props7.isSubmitShareDisabled,
         additionalUserFields = _this$props7.additionalUserFields,
-        isExtendedShareDialogEnabled = _this$props7.isExtendedShareDialogEnabled;
+        isExtendedShareDialogEnabled = _this$props7.isExtendedShareDialogEnabled,
+        CustomSubmitButton = _this$props7.CustomSubmitButton;
       var footer = (0, _utils.resolveShareFooter)(integrationMode, this.state.tabIndex, customFooter);
 
       // for performance purposes, we may want to have a loadable content i.e. ShareForm
@@ -622,7 +623,8 @@ var ShareDialogWithTriggerInternal = exports.ShareDialogWithTriggerInternal = /*
             isBrowseUsersDisabled: isBrowseUsersDisabled,
             userPickerOptions: userPickerOptions,
             additionalUserFields: additionalUserFields,
-            isExtendedShareDialogEnabled: isExtendedShareDialogEnabled
+            isExtendedShareDialogEnabled: isExtendedShareDialogEnabled,
+            CustomSubmitButton: CustomSubmitButton
           }));
         },
         isOpen: isDialogOpen,

package/dist/cjs/components/ShareForm.js

@@ -157,7 +157,10 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         userPickerOptions = _this$props.userPickerOptions,
         productAttributes = _this$props.productAttributes,
         additionalUserFields = _this$props.additionalUserFields,
-        isExtendedShareDialogEnabled = _this$props.isExtendedShareDialogEnabled;
+        isExtendedShareDialogEnabled = _this$props.isExtendedShareDialogEnabled,
+        isSharing = _this$props.isSharing,
+        isSubmitShareDisabled = _this$props.isSubmitShareDisabled,
+        CustomSubmitButton = _this$props.CustomSubmitButton;
       return (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
         data: {
           source: _analytics.ANALYTICS_SOURCE
@@ -224,7 +227,13 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         copyTooltipText: copyTooltipText,
         copyLinkButtonText: formatMessage(isPublicLink ? _i18n.messages.copyPublicLinkButtonText : _i18n.messages.copyLinkButtonText),
         copiedToClipboardText: formatMessage(_i18n.messages.copiedToClipboardMessage)
-      }), _this.renderSubmitButton())));
+      }), isExtendedShareDialogEnabled && CustomSubmitButton ? (0, _react2.jsx)(CustomSubmitButton, {
+        shareError: shareError,
+        isSharing: isSharing,
+        isDisabled: isDisabled,
+        isSubmitShareDisabled: isSubmitShareDisabled,
+        isPublicLink: isPublicLink
+      }) : _this.renderSubmitButton())));
     });
     (0, _defineProperty2.default)(_this, "renderSubmitButton", function () {
       var _this$props2 = _this.props,
@@ -245,7 +254,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 (0, _react2.jsx)("div", {
         css: submitButtonWrapperStyles
@@ -318,163 +327,64 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         handleCloseDialog = _this$props7.handleCloseDialog,
         isExtendedShareDialogEnabled = _this$props7.isExtendedShareDialogEnabled;
       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 = isExtendedShareDialogEnabled ? 452 : 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) {
+      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 (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 (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 = isExtendedShareDialogEnabled ? 452 : 304;
+        var DEFAULT_TAB_CONTENT_WIDTH = isExtendedShareDialogEnabled ? 452 : 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()), (0, _react2.jsx)(_tabs.Tab, {
-          key: "share-tab-".concat(firstIntegration.type)
-        }, (0, _react2.jsx)("div", {
-          css: integrationWrapperStyles
-        }, (0, _react2.jsx)("span", {
-          css: integrationIconWrapperStyles
-        }, (0, _react2.jsx)(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 (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);
@@ -484,27 +394,29 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           css: formWrapperStyles
         }, (0, _react2.jsx)("div", {
           style: {
-            width: "".concat(builtInTabContentWidth || _DEFAULT_TAB_CONTENT_WIDTH, "px")
-          }
-        }, this.renderShareForm()))), (0, _react2.jsx)(_tabs.TabPanel, {
-          key: "share-tabPanel-integration"
-        }, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
-          data: {
-            source: _analytics.INTEGRATION_MODAL_SOURCE
+            width: "".concat(builtInTabContentWidth || DEFAULT_TAB_CONTENT_WIDTH, "px")
           }
-        }, (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: 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 (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", {