@atlaskit/share 3.0.4 → 3.0.8

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/share
 
+## 3.0.8
+
+### Patch Changes
+
+- [`9f7c98cf94f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9f7c98cf94f) - Fixes issues with share dialog closing and resetting tabIndex
+
+## 3.0.7
+
+### Patch Changes
+
+- [`4e97b934e85`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e97b934e85) - Adds condition to only render customFooter for default share form
+
+## 3.0.6
+
+### Patch Changes
+
+- [`3bada8f14f6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3bada8f14f6) - Rendering of share form submit button depends on the integration type. A type of 'tabs' will change the label to 'share'
+
+## 3.0.5
+
+### Patch Changes
+
+- [`7fe36d0765b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7fe36d0765b) - Analytics context changes for share to integrations
+
 ## 3.0.4
 
 ### Patch Changes

package/dist/cjs/clients/ShareServiceClient.js

@@ -15,9 +15,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _utilServiceSupport = require("@atlaskit/util-service-support");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var DEFAULT_SHARE_PATH = 'share';
 exports.DEFAULT_SHARE_PATH = DEFAULT_SHARE_PATH;

package/dist/cjs/components/IntegrationButton.js

@@ -19,6 +19,8 @@ var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom
 
 var _colors = require("@atlaskit/theme/colors");
 
+var _excluded = ["text", "textColor", "IntegrationIcon"];
+
 var _templateObject, _templateObject2;
 
 var IntegrationButtonCopyWrapper = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: ", ";\n  display: flex;\n  justify-content: left;\n"])), function (props) {
@@ -31,7 +33,7 @@ var IntegrationButton = function IntegrationButton(props) {
   var text = props.text,
       textColor = props.textColor,
       IntegrationIcon = props.IntegrationIcon,
-      restProps = (0, _objectWithoutProperties2.default)(props, ["text", "textColor", "IntegrationIcon"]);
+      restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   return /*#__PURE__*/_react.default.createElement(_customThemeButton.default, restProps, /*#__PURE__*/_react.default.createElement(IntegrationButtonCopyWrapper, {
     theme: {
       textColor: textColor

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

@@ -58,21 +58,21 @@ function LazyShareForm(props) {
       defaultValue = props.defaultValue,
       showTitle = props.showTitle;
 
-  var footer = /*#__PURE__*/_react.default.createElement("div", null, bottomMessage ? /*#__PURE__*/_react.default.createElement(_styled.BottomMessageWrapper, null, bottomMessage) : null, customFooter && /*#__PURE__*/_react.default.createElement(_styled.CustomFooterWrapper, null, customFooter));
+  var footer = /*#__PURE__*/_react.default.createElement("div", null, bottomMessage ? /*#__PURE__*/_react.default.createElement(_styled.BottomMessageWrapper, null, bottomMessage) : null, customFooter && selectedIntegration === null && /*#__PURE__*/_react.default.createElement(_styled.CustomFooterWrapper, null, customFooter));
 
-  return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
-    data: {
-      source: _analytics.ANALYTICS_SOURCE
-    }
-  }, /*#__PURE__*/_react.default.createElement(_ShareFormWrapper.ShareFormWrapper, {
+  return /*#__PURE__*/_react.default.createElement(_ShareFormWrapper.ShareFormWrapper, {
     footer: footer // form title will be determined by `title` and `showTitle` prop passed to `ShareForm`,
     // so we don't need to show title via ShareFormWrapper
     ,
     shouldShowTitle: false
-  }, showIntegrationForm && selectedIntegration !== null ? /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
+  }, showIntegrationForm && selectedIntegration !== null ? /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
+    data: {
+      source: _analytics.INTEGRATION_MODAL_SOURCE
+    }
+  }, /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
     Content: selectedIntegration.Content,
     onIntegrationClose: onDialogClose
-  }) : /*#__PURE__*/_react.default.createElement(_ShareForm.ShareForm, {
+  })) : /*#__PURE__*/_react.default.createElement(_ShareForm.ShareForm, {
     copyLink: copyLink,
     loadOptions: loadOptions,
     title: shareFormTitle,
@@ -100,7 +100,7 @@ function LazyShareForm(props) {
     onUserSelectionChange: onUserSelectionChange,
     handleCloseDialog: onDialogClose,
     onTabChange: onTabChange
-  })));
+  }));
 }
 
 var _default = LazyShareForm;

package/dist/cjs/components/MessagesIntlProvider.js

@@ -21,9 +21,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var MessagesIntlProvider = function MessagesIntlProvider(_ref) {
   var intl = _ref.intl,

package/dist/cjs/components/ShareButton.js

@@ -15,9 +15,11 @@ var _react = _interopRequireDefault(require("react"));
 
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 
+var _excluded = ["text"];
+
 var ShareButton = /*#__PURE__*/_react.default.forwardRef(function ShareButton(_ref, ref) {
   var text = _ref.text,
-      props = (0, _objectWithoutProperties2.default)(_ref, ["text"]);
+      props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_customThemeButton.default, (0, _extends2.default)({
     ref: ref,
     "aria-expanded": props.isSelected

package/dist/cjs/components/ShareDialogContainer.js

@@ -53,9 +53,9 @@ var _ShareDialogWithTrigger = require("./ShareDialogWithTrigger");
 
 var _utils = require("./utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 

package/dist/cjs/components/ShareDialogWithTrigger.js

@@ -59,9 +59,9 @@ var _utils = require("./utils");
 
 var _templateObject;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
@@ -104,7 +104,8 @@ var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureComponent
       defaultValue: defaultShareContentState,
       isUsingSplitButton: false,
       showIntegrationForm: false,
-      selectedIntegration: null
+      selectedIntegration: null,
+      tabIndex: 0
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "closeAndResetDialog", function () {
       _this.setState({
@@ -149,6 +150,10 @@ var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureComponent
       }
 
       _this.createAndFireEvent((0, _analytics.shareTabClicked)(subjectId));
+
+      _this.setState({
+        tabIndex: index
+      });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getFlags", function () {
       var formatMessage = _this.props.intl.formatMessage; // The reason for providing message property is that in jira,
@@ -250,7 +255,8 @@ var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureComponent
       _this.setState({
         isDialogOpen: false,
         showIntegrationForm: false,
-        selectedIntegration: null
+        selectedIntegration: null,
+        tabIndex: 0
       });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleShareSubmit", function (data) {
@@ -450,7 +456,8 @@ var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureComponent
           shareIntegrations = _this$props7.shareIntegrations;
       var style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
         outline: 'none'
-      } : undefined; // for performance purposes, we may want to have a loadable content i.e. ShareForm
+      } : undefined;
+      var footer = (0, _utils.resolveShareFooter)(integrationMode, this.state.tabIndex, customFooter); // for performance purposes, we may want to have a loadable content i.e. ShareForm
 
       return /*#__PURE__*/_react.default.createElement(ShareButtonWrapper, {
         tabIndex: tabIndex,
@@ -466,7 +473,7 @@ var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureComponent
             copyLink: copyLink,
             showIntegrationForm: showIntegrationForm,
             bottomMessage: bottomMessage,
-            customFooter: customFooter,
+            customFooter: footer,
             loadOptions: loadUserOptions,
             isSharing: isSharing,
             shareFormTitle: shareFormTitle,

package/dist/cjs/components/ShareForm.js

@@ -33,6 +33,8 @@ var _reactIntlNext = require("react-intl-next");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
+var _analyticsNext = require("@atlaskit/analytics-next");
+
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 
 var _form = _interopRequireDefault(require("@atlaskit/form"));
@@ -51,6 +53,8 @@ var _i18n = require("../i18n");
 
 var _types = require("../types");
 
+var _analytics = require("./analytics");
+
 var _CommentField = require("./CommentField");
 
 var _CopyLinkButton = _interopRequireDefault(require("./CopyLinkButton"));
@@ -67,9 +71,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
@@ -79,9 +83,7 @@ var SubmitButtonWrapper = _styledComponents.default.div(_templateObject || (_tem
 
 var CenterAlignedIconWrapper = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-self: center;\n  padding: 0 10px;\n\n  > div {\n    line-height: 1;\n  }\n"])));
 
-var FormWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  margin-top: ", "px;\n  width: 100%;\n\n  /* jira has a class override font settings on h1 in gh-custom-field-pickers.css */\n  #ghx-modes-tools #ghx-share & h1:first-child {\n    margin-top: 0;\n  }\n"])), function (props) {
-  return props.isMainShare ? (0, _constants.gridSize)() : (0, _constants.gridSize)() * 2;
-});
+var FormWrapper = _styledComponents.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  margin-top: ", "px;\n  width: 100%;\n\n  /* jira has a class override font settings on h1 in gh-custom-field-pickers.css */\n  #ghx-modes-tools #ghx-share & h1:first-child {\n    margin-top: 0;\n  }\n"])), (0, _constants.gridSize)());
 
 exports.FormWrapper = FormWrapper;
 
@@ -93,7 +95,7 @@ var FormField = _styledComponents.default.div(_templateObject5 || (_templateObje
 
 var IntegrationWrapper = _styledComponents.default.div(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n"])));
 
-var IntegrationIconWrapper = _styledComponents.default.span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  margin-bottom: -2px;\n  margin-right: 5px;\n"])));
+var IntegrationIconWrapper = _styledComponents.default.span(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n  margin-bottom: -6px;\n  margin-right: 5px;\n"])));
 
 var integrationTabText = function integrationTabText(integrationName) {
   return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _i18n.messages.shareInIntegrationButtonText, {
@@ -146,7 +148,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           isPublicLink = _this$props.isPublicLink,
           copyTooltipText = _this$props.copyTooltipText,
           helperMessage = _this$props.helperMessage;
-      return /*#__PURE__*/_react.default.createElement("form", formProps, showTitle && /*#__PURE__*/_react.default.createElement(_ShareHeader.ShareHeader, {
+      return /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
+        data: {
+          source: _analytics.ANALYTICS_SOURCE
+        }
+      }, /*#__PURE__*/_react.default.createElement("form", formProps, showTitle && /*#__PURE__*/_react.default.createElement(_ShareHeader.ShareHeader, {
         title: title
       }), /*#__PURE__*/_react.default.createElement(FormField, null, /*#__PURE__*/_react.default.createElement(_UserPickerField.UserPickerField, {
         onInputChange: onUserInputChange,
@@ -170,7 +176,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         link: copyLink,
         isPublicLink: isPublicLink,
         copyTooltipText: copyTooltipText
-      }), _this.renderSubmitButton()));
+      }), _this.renderSubmitButton())));
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderSubmitButton", function () {
       var _this$props2 = _this.props,
@@ -179,10 +185,14 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           shareError = _this$props2.shareError,
           submitButtonLabel = _this$props2.submitButtonLabel,
           isDisabled = _this$props2.isDisabled,
-          isPublicLink = _this$props2.isPublicLink;
+          isPublicLink = _this$props2.isPublicLink,
+          integrationMode = _this$props2.integrationMode;
       var shouldShowWarning = shareError && !isSharing;
       var buttonAppearance = !shouldShowWarning ? 'primary' : 'warning';
-      var sendLabel = isPublicLink ? _i18n.messages.formSendPublic : _i18n.messages.formSend;
+      var tabMode = integrationMode === 'tabs';
+      var formPublicLabel = tabMode ? _i18n.messages.formSharePublic : _i18n.messages.formSendPublic;
+      var formSendLabel = tabMode ? _i18n.messages.formShare : _i18n.messages.formSend;
+      var sendLabel = isPublicLink ? formPublicLabel : formSendLabel;
       var buttonLabel = shareError ? _i18n.messages.formRetry : sendLabel;
       var ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : _react.default.Fragment;
       return /*#__PURE__*/_react.default.createElement(SubmitButtonWrapper, null, /*#__PURE__*/_react.default.createElement(CenterAlignedIconWrapper, null, shouldShowWarning && /*#__PURE__*/_react.default.createElement(_tooltip.default, {
@@ -215,9 +225,13 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
       return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, productShareType);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "changeTab", function (tab) {
+      var _this$props$onTabChan, _this$props4;
+
       _this.setState({
         selectedTab: tab
       });
+
+      (_this$props$onTabChan = (_this$props4 = _this.props).onTabChange) === null || _this$props$onTabChan === void 0 ? void 0 : _this$props$onTabChan.call(_this$props4, tab);
     });
     return _this;
   }
@@ -225,9 +239,9 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
   (0, _createClass2.default)(InternalForm, [{
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      var _this$props4 = this.props,
-          onDismiss = _this$props4.onDismiss,
-          getValues = _this$props4.getValues;
+      var _this$props5 = this.props,
+          onDismiss = _this$props5.onDismiss,
+          getValues = _this$props5.getValues;
 
       if (onDismiss) {
         onDismiss(getValues());
@@ -236,14 +250,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
-
-      var _this$props5 = this.props,
-          _this$props5$integrat = _this$props5.integrationMode,
-          integrationMode = _this$props5$integrat === void 0 ? 'off' : _this$props5$integrat,
-          shareIntegrations = _this$props5.shareIntegrations,
-          onTabChange = _this$props5.onTabChange,
-          handleCloseDialog = _this$props5.handleCloseDialog;
+      var _this$props6 = this.props,
+          _this$props6$integrat = _this$props6.integrationMode,
+          integrationMode = _this$props6$integrat === void 0 ? 'off' : _this$props6$integrat,
+          shareIntegrations = _this$props6.shareIntegrations,
+          handleCloseDialog = _this$props6.handleCloseDialog;
 
       if (integrationMode === 'off' || !shareIntegrations || !shareIntegrations.length) {
         return this.renderShareForm();
@@ -254,11 +265,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
       if (integrationMode === 'tabs') {
         return /*#__PURE__*/_react.default.createElement(_tabs.default, {
           id: "ShareForm-Tabs-Integrations",
-          onChange: function onChange(index) {
-            _this2.changeTab(index);
-
-            onTabChange === null || onTabChange === void 0 ? void 0 : onTabChange(index);
-          },
+          onChange: this.changeTab,
           selected: this.state.selectedTab
         }, /*#__PURE__*/_react.default.createElement(_tabs.TabList, null, /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
           key: "share-tab-default"
@@ -266,21 +273,19 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           key: "share-tab-".concat(firstIntegration.type)
         }, /*#__PURE__*/_react.default.createElement(IntegrationWrapper, null, /*#__PURE__*/_react.default.createElement(IntegrationIconWrapper, null, /*#__PURE__*/_react.default.createElement(firstIntegration.Icon, null)), integrationTabText(firstIntegration.type)))), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
           key: "share-tabPanel-default"
-        }, /*#__PURE__*/_react.default.createElement(FormWrapper, {
-          isMainShare: true
-        }, this.renderShareForm())), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
+        }, /*#__PURE__*/_react.default.createElement(FormWrapper, null, this.renderShareForm())), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
           key: "share-tabPanel-integration"
-        }, /*#__PURE__*/_react.default.createElement(FormWrapper, {
-          isMainShare: false
-        }, /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
+        }, /*#__PURE__*/_react.default.createElement(_analyticsNext.AnalyticsContext, {
+          data: {
+            source: _analytics.INTEGRATION_MODAL_SOURCE
+          }
+        }, /*#__PURE__*/_react.default.createElement(FormWrapper, null, /*#__PURE__*/_react.default.createElement(_IntegrationForm.IntegrationForm, {
           Content: firstIntegration.Content,
           onIntegrationClose: function onIntegrationClose() {
             return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
           },
-          changeTab: function changeTab(index) {
-            _this2.changeTab(index);
-          }
-        }))));
+          changeTab: this.changeTab
+        })))));
       }
 
       return this.renderShareForm();

package/dist/cjs/components/SplitButton.js

@@ -37,6 +37,8 @@ var _analytics = require("./analytics");
 
 var _IntegrationButton = _interopRequireDefault(require("./IntegrationButton"));
 
+var _excluded = ["triggerRef"];
+
 var _templateObject, _templateObject2, _templateObject3;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -82,7 +84,7 @@ var SplitButtonDropdown = function SplitButtonDropdown(props) {
     testId: "split-button-dropdown",
     trigger: function trigger(_ref2) {
       var triggerRef = _ref2.triggerRef,
-          providedProps = (0, _objectWithoutProperties2.default)(_ref2, ["triggerRef"]);
+          providedProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
       return /*#__PURE__*/_react.default.createElement(_standardButton.default, (0, _extends2.default)({}, providedProps, {
         ref: triggerRef,
         iconBefore: /*#__PURE__*/_react.default.createElement(_chevronDown.default, {

package/dist/cjs/components/analytics.js

@@ -13,9 +13,9 @@ var _userPicker = require("@atlaskit/user-picker");
 
 var _version = require("../version.json");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var buildAttributes = function buildAttributes() {
   var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -50,7 +50,7 @@ var CHANNEL_ID = 'fabric-elements';
 exports.CHANNEL_ID = CHANNEL_ID;
 var ANALYTICS_SOURCE = 'shareModal';
 exports.ANALYTICS_SOURCE = ANALYTICS_SOURCE;
-var INTEGRATION_MODAL_SOURCE = 'integrationShareModal';
+var INTEGRATION_MODAL_SOURCE = 'integrationShareDialog';
 exports.INTEGRATION_MODAL_SOURCE = INTEGRATION_MODAL_SOURCE;
 
 var screenEvent = function screenEvent(_ref) {

package/dist/cjs/components/styles.js

@@ -17,9 +17,11 @@ var _react = _interopRequireDefault(require("react"));
 
 var _customThemeButton = _interopRequireDefault(require("@atlaskit/button/custom-theme-button"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["buttonStyles"];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var MAX_PICKER_HEIGHT = 102;
 exports.MAX_PICKER_HEIGHT = MAX_PICKER_HEIGHT;
@@ -31,7 +33,7 @@ var StyledButton = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     theme: function theme(currentTheme, themeProps) {
       var _currentTheme = currentTheme(themeProps),
           buttonStyles = _currentTheme.buttonStyles,
-          rest = (0, _objectWithoutProperties2.default)(_currentTheme, ["buttonStyles"]);
+          rest = (0, _objectWithoutProperties2.default)(_currentTheme, _excluded);
 
       return _objectSpread({
         buttonStyles: _objectSpread(_objectSpread({}, buttonStyles), {}, {

package/dist/cjs/components/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.zIndexAddition = exports.optionDataToUsers = exports.getMenuPortalTargetCurrentHTML = exports.generateSelectZIndex = exports.allowEmails = void 0;
+exports.zIndexAddition = exports.resolveShareFooter = exports.optionDataToUsers = exports.getMenuPortalTargetCurrentHTML = exports.generateSelectZIndex = exports.allowEmails = void 0;
 
 var _constants = require("@atlaskit/theme/constants");
 
@@ -73,4 +73,12 @@ var allowEmails = function allowEmails(config) {
   return !(config && config.disableSharingToEmails);
 };
 
-exports.allowEmails = allowEmails;
+exports.allowEmails = allowEmails;
+
+var resolveShareFooter = function resolveShareFooter(integrationMode, tabIndex, customFooter) {
+  if (integrationMode === 'tabs' && tabIndex === 0 && customFooter) {
+    return customFooter;
+  }
+};
+
+exports.resolveShareFooter = resolveShareFooter;

package/dist/cjs/i18n.js

@@ -18,11 +18,21 @@ var messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Send',
     description: 'Label for Share form submit button.'
   },
+  formShare: {
+    id: 'fabric.elements.share.form.share',
+    defaultMessage: 'Share',
+    description: 'Label for Share form submit button.'
+  },
   formSendPublic: {
     id: 'fabric.elements.share.form.public.send',
     defaultMessage: 'Send public link',
     description: 'Label for Share form submit button when link is public.'
   },
+  formSharePublic: {
+    id: 'fabric.elements.share.form.public.share',
+    defaultMessage: 'Share public link',
+    description: 'Label for Share form submit button when link is public.'
+  },
   formRetry: {
     id: 'fabric.elements.share.form.retry',
     defaultMessage: 'Retry',

package/dist/cjs/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/share",
-	"version": "3.0.4"
+	"version": "3.0.8"
 }

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { AnalyticsContext } from '@atlaskit/analytics-next';
-import { ANALYTICS_SOURCE } from '../analytics';
+import { INTEGRATION_MODAL_SOURCE } from '../analytics';
 import { IntegrationForm } from '../IntegrationForm';
 import { ShareForm } from '../ShareForm';
 import { ShareFormWrapper } from '../ShareFormWrapper';
@@ -47,20 +47,20 @@ function LazyShareForm(props) {
     defaultValue,
     showTitle
   } = props;
-  const footer = /*#__PURE__*/React.createElement("div", null, bottomMessage ? /*#__PURE__*/React.createElement(BottomMessageWrapper, null, bottomMessage) : null, customFooter && /*#__PURE__*/React.createElement(CustomFooterWrapper, null, customFooter));
-  return /*#__PURE__*/React.createElement(AnalyticsContext, {
-    data: {
-      source: ANALYTICS_SOURCE
-    }
-  }, /*#__PURE__*/React.createElement(ShareFormWrapper, {
+  const footer = /*#__PURE__*/React.createElement("div", null, bottomMessage ? /*#__PURE__*/React.createElement(BottomMessageWrapper, null, bottomMessage) : null, customFooter && selectedIntegration === null && /*#__PURE__*/React.createElement(CustomFooterWrapper, null, customFooter));
+  return /*#__PURE__*/React.createElement(ShareFormWrapper, {
     footer: footer // form title will be determined by `title` and `showTitle` prop passed to `ShareForm`,
     // so we don't need to show title via ShareFormWrapper
     ,
     shouldShowTitle: false
-  }, showIntegrationForm && selectedIntegration !== null ? /*#__PURE__*/React.createElement(IntegrationForm, {
+  }, showIntegrationForm && selectedIntegration !== null ? /*#__PURE__*/React.createElement(AnalyticsContext, {
+    data: {
+      source: INTEGRATION_MODAL_SOURCE
+    }
+  }, /*#__PURE__*/React.createElement(IntegrationForm, {
     Content: selectedIntegration.Content,
     onIntegrationClose: onDialogClose
-  }) : /*#__PURE__*/React.createElement(ShareForm, {
+  })) : /*#__PURE__*/React.createElement(ShareForm, {
     copyLink: copyLink,
     loadOptions: loadOptions,
     title: shareFormTitle,
@@ -88,7 +88,7 @@ function LazyShareForm(props) {
     onUserSelectionChange: onUserSelectionChange,
     handleCloseDialog: onDialogClose,
     onTabChange: onTabChange
-  })));
+  }));
 }
 
 export default LazyShareForm;

package/dist/es2019/components/ShareDialogWithTrigger.js

@@ -17,7 +17,7 @@ import { cancelShare, CHANNEL_ID, copyLinkButtonClicked, formShareSubmitted, scr
 import LazyShareFormLazy from './LazyShareForm/lazy';
 import ShareButton from './ShareButton';
 import SplitButton from './SplitButton';
-import { generateSelectZIndex } from './utils';
+import { generateSelectZIndex, resolveShareFooter } from './utils';
 const ShareButtonWrapper = styled.div`
   display: inline-flex;
   outline: none;
@@ -47,7 +47,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
       defaultValue: defaultShareContentState,
       isUsingSplitButton: false,
       showIntegrationForm: false,
-      selectedIntegration: null
+      selectedIntegration: null,
+      tabIndex: 0
     });
 
     _defineProperty(this, "closeAndResetDialog", () => {
@@ -96,6 +97,9 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
       }
 
       this.createAndFireEvent(shareTabClicked(subjectId));
+      this.setState({
+        tabIndex: index
+      });
     });
 
     _defineProperty(this, "getFlags", () => {
@@ -209,7 +213,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
       this.setState({
         isDialogOpen: false,
         showIntegrationForm: false,
-        selectedIntegration: null
+        selectedIntegration: null,
+        tabIndex: 0
       });
     });
 
@@ -410,7 +415,8 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
     } = this.props;
     const style = typeof tabIndex !== 'undefined' && tabIndex >= 0 ? {
       outline: 'none'
-    } : undefined; // for performance purposes, we may want to have a loadable content i.e. ShareForm
+    } : undefined;
+    const footer = resolveShareFooter(integrationMode, this.state.tabIndex, customFooter); // for performance purposes, we may want to have a loadable content i.e. ShareForm
 
     return /*#__PURE__*/React.createElement(ShareButtonWrapper, {
       tabIndex: tabIndex,
@@ -425,7 +431,7 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
         copyLink: copyLink,
         showIntegrationForm: showIntegrationForm,
         bottomMessage: bottomMessage,
-        customFooter: customFooter,
+        customFooter: footer,
         loadOptions: loadUserOptions,
         isSharing: isSharing,
         shareFormTitle: shareFormTitle,