@atlaskit/share 3.0.4 → 3.0.8

package/dist/es2019/components/ShareForm.js

@@ -3,6 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/custom-theme-button';
 import Form from '@atlaskit/form';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
@@ -12,6 +13,7 @@ import { gridSize } from '@atlaskit/theme/constants';
 import Tooltip from '@atlaskit/tooltip';
 import { messages } from '../i18n';
 import { TabType } from '../types';
+import { ANALYTICS_SOURCE, INTEGRATION_MODAL_SOURCE } from './analytics';
 import { CommentField } from './CommentField';
 import CopyLinkButton from './CopyLinkButton';
 import { IntegrationForm } from './IntegrationForm';
@@ -31,7 +33,7 @@ const CenterAlignedIconWrapper = styled.div`
   }
 `;
 export const FormWrapper = styled.div`
-  margin-top: ${props => props.isMainShare ? gridSize() : gridSize() * 2}px;
+  margin-top: ${gridSize()}px;
   width: 100%;
 
   /* jira has a class override font settings on h1 in gh-custom-field-pickers.css */
@@ -52,7 +54,7 @@ const IntegrationWrapper = styled.div`
   align-items: center;
 `;
 const IntegrationIconWrapper = styled.span`
-  margin-bottom: -2px;
+  margin-bottom: -6px;
   margin-right: 5px;
 `;
 
@@ -95,7 +97,11 @@ class InternalForm extends React.PureComponent {
         copyTooltipText,
         helperMessage
       } = this.props;
-      return /*#__PURE__*/React.createElement("form", formProps, showTitle && /*#__PURE__*/React.createElement(ShareHeader, {
+      return /*#__PURE__*/React.createElement(AnalyticsContext, {
+        data: {
+          source: ANALYTICS_SOURCE
+        }
+      }, /*#__PURE__*/React.createElement("form", formProps, showTitle && /*#__PURE__*/React.createElement(ShareHeader, {
         title: title
       }), /*#__PURE__*/React.createElement(FormField, null, /*#__PURE__*/React.createElement(UserPickerField, {
         onInputChange: onUserInputChange,
@@ -119,7 +125,7 @@ class InternalForm extends React.PureComponent {
         link: copyLink,
         isPublicLink: isPublicLink,
         copyTooltipText: copyTooltipText
-      }), this.renderSubmitButton()));
+      }), this.renderSubmitButton())));
     });
 
     _defineProperty(this, "renderSubmitButton", () => {
@@ -131,11 +137,15 @@ class InternalForm extends React.PureComponent {
         shareError,
         submitButtonLabel,
         isDisabled,
-        isPublicLink
+        isPublicLink,
+        integrationMode
       } = this.props;
       const shouldShowWarning = shareError && !isSharing;
       const buttonAppearance = !shouldShowWarning ? 'primary' : 'warning';
-      const sendLabel = isPublicLink ? messages.formSendPublic : messages.formSend;
+      const tabMode = integrationMode === 'tabs';
+      const formPublicLabel = tabMode ? messages.formSharePublic : messages.formSendPublic;
+      const formSendLabel = tabMode ? messages.formShare : messages.formSend;
+      const sendLabel = isPublicLink ? formPublicLabel : formSendLabel;
       const buttonLabel = shareError ? messages.formRetry : sendLabel;
       const ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : React.Fragment;
       return /*#__PURE__*/React.createElement(SubmitButtonWrapper, null, /*#__PURE__*/React.createElement(CenterAlignedIconWrapper, null, shouldShowWarning && /*#__PURE__*/React.createElement(Tooltip, {
@@ -173,9 +183,12 @@ class InternalForm extends React.PureComponent {
     });
 
     _defineProperty(this, "changeTab", tab => {
+      var _this$props$onTabChan, _this$props;
+
       this.setState({
         selectedTab: tab
       });
+      (_this$props$onTabChan = (_this$props = this.props).onTabChange) === null || _this$props$onTabChan === void 0 ? void 0 : _this$props$onTabChan.call(_this$props, tab);
     });
   }
 
@@ -194,7 +207,6 @@ class InternalForm extends React.PureComponent {
     const {
       integrationMode = 'off',
       shareIntegrations,
-      onTabChange,
       handleCloseDialog
     } = this.props;
 
@@ -207,10 +219,7 @@ class InternalForm extends React.PureComponent {
     if (integrationMode === 'tabs') {
       return /*#__PURE__*/React.createElement(Tabs, {
         id: "ShareForm-Tabs-Integrations",
-        onChange: index => {
-          this.changeTab(index);
-          onTabChange === null || onTabChange === void 0 ? void 0 : onTabChange(index);
-        },
+        onChange: this.changeTab,
         selected: this.state.selectedTab
       }, /*#__PURE__*/React.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, {
         key: `share-tab-default`
@@ -218,19 +227,17 @@ class InternalForm extends React.PureComponent {
         key: `share-tab-${firstIntegration.type}`
       }, /*#__PURE__*/React.createElement(IntegrationWrapper, null, /*#__PURE__*/React.createElement(IntegrationIconWrapper, null, /*#__PURE__*/React.createElement(firstIntegration.Icon, null)), integrationTabText(firstIntegration.type)))), /*#__PURE__*/React.createElement(TabPanel, {
         key: `share-tabPanel-default`
-      }, /*#__PURE__*/React.createElement(FormWrapper, {
-        isMainShare: true
-      }, this.renderShareForm())), /*#__PURE__*/React.createElement(TabPanel, {
+      }, /*#__PURE__*/React.createElement(FormWrapper, null, this.renderShareForm())), /*#__PURE__*/React.createElement(TabPanel, {
         key: `share-tabPanel-integration`
-      }, /*#__PURE__*/React.createElement(FormWrapper, {
-        isMainShare: false
-      }, /*#__PURE__*/React.createElement(IntegrationForm, {
+      }, /*#__PURE__*/React.createElement(AnalyticsContext, {
+        data: {
+          source: INTEGRATION_MODAL_SOURCE
+        }
+      }, /*#__PURE__*/React.createElement(FormWrapper, null, /*#__PURE__*/React.createElement(IntegrationForm, {
         Content: firstIntegration.Content,
         onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
-        changeTab: index => {
-          this.changeTab(index);
-        }
-      }))));
+        changeTab: this.changeTab
+      })))));
     }
 
     return this.renderShareForm();

package/dist/es2019/components/analytics.js

@@ -24,7 +24,7 @@ const createScreenEvent = (name, attributes = {}) => ({
 
 export const CHANNEL_ID = 'fabric-elements';
 export const ANALYTICS_SOURCE = 'shareModal';
-export const INTEGRATION_MODAL_SOURCE = 'integrationShareModal';
+export const INTEGRATION_MODAL_SOURCE = 'integrationShareDialog';
 export const screenEvent = ({
   isPublicLink = false
 }) => createScreenEvent(ANALYTICS_SOURCE, {

package/dist/es2019/components/utils.js

@@ -49,4 +49,9 @@ export const optionDataToUsers = optionDataArray => optionDataArray.map(optionDa
       };
   }
 });
-export const allowEmails = config => !(config && config.disableSharingToEmails);
+export const allowEmails = config => !(config && config.disableSharingToEmails);
+export const resolveShareFooter = (integrationMode, tabIndex, customFooter) => {
+  if (integrationMode === 'tabs' && tabIndex === 0 && customFooter) {
+    return customFooter;
+  }
+};

package/dist/es2019/i18n.js

@@ -10,11 +10,21 @@ export const messages = 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/es2019/version.json

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

package/dist/esm/clients/ShareServiceClient.js

@@ -2,9 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 
-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) { _defineProperty(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) { _defineProperty(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; }
 
 import { utils } from '@atlaskit/util-service-support';
 export var DEFAULT_SHARE_PATH = 'share';

package/dist/esm/components/IntegrationButton.js

@@ -1,5 +1,6 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+var _excluded = ["text", "textColor", "IntegrationIcon"];
 
 var _templateObject, _templateObject2;
 
@@ -16,7 +17,7 @@ var IntegrationButton = function IntegrationButton(props) {
   var text = props.text,
       textColor = props.textColor,
       IntegrationIcon = props.IntegrationIcon,
-      restProps = _objectWithoutProperties(props, ["text", "textColor", "IntegrationIcon"]);
+      restProps = _objectWithoutProperties(props, _excluded);
 
   return /*#__PURE__*/React.createElement(Button, restProps, /*#__PURE__*/React.createElement(IntegrationButtonCopyWrapper, {
     theme: {

package/dist/esm/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';
@@ -42,20 +42,20 @@ function LazyShareForm(props) {
       shareError = props.shareError,
       defaultValue = props.defaultValue,
       showTitle = props.showTitle;
-  var 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, {
+  var 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,
@@ -83,7 +83,7 @@ function LazyShareForm(props) {
     onUserSelectionChange: onUserSelectionChange,
     handleCloseDialog: onDialogClose,
     onTabChange: onTabChange
-  })));
+  }));
 }
 
 export default LazyShareForm;

package/dist/esm/components/MessagesIntlProvider.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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) { _defineProperty(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) { _defineProperty(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; }
 
 import React, { useMemo } from 'react';
 import { injectIntl, IntlProvider } from 'react-intl-next';

package/dist/esm/components/ShareButton.js

@@ -1,10 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["text"];
 import React from 'react';
 import Button from '@atlaskit/button/custom-theme-button';
 export var ShareButton = /*#__PURE__*/React.forwardRef(function ShareButton(_ref, ref) {
   var text = _ref.text,
-      props = _objectWithoutProperties(_ref, ["text"]);
+      props = _objectWithoutProperties(_ref, _excluded);
 
   return /*#__PURE__*/React.createElement(Button, _extends({
     ref: ref,

package/dist/esm/components/ShareDialogContainer.js

@@ -8,9 +8,9 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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) { _defineProperty(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) { _defineProperty(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 = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 

package/dist/esm/components/ShareDialogWithTrigger.js

@@ -10,9 +10,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 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) { _defineProperty(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) { _defineProperty(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 = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -35,7 +35,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';
 var ShareButtonWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: inline-flex;\n  outline: none;\n"])));
 export var defaultShareContentState = {
   users: [],
@@ -74,7 +74,8 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
       defaultValue: defaultShareContentState,
       isUsingSplitButton: false,
       showIntegrationForm: false,
-      selectedIntegration: null
+      selectedIntegration: null,
+      tabIndex: 0
     });
 
     _defineProperty(_assertThisInitialized(_this), "closeAndResetDialog", function () {
@@ -122,6 +123,10 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
       }
 
       _this.createAndFireEvent(shareTabClicked(subjectId));
+
+      _this.setState({
+        tabIndex: index
+      });
     });
 
     _defineProperty(_assertThisInitialized(_this), "getFlags", function () {
@@ -228,7 +233,8 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
       _this.setState({
         isDialogOpen: false,
         showIntegrationForm: false,
-        selectedIntegration: null
+        selectedIntegration: null,
+        tabIndex: 0
       });
     });
 
@@ -436,7 +442,8 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
           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 = 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,
@@ -452,7 +459,7 @@ export var ShareDialogWithTriggerInternal = /*#__PURE__*/function (_React$PureCo
             copyLink: copyLink,
             showIntegrationForm: showIntegrationForm,
             bottomMessage: bottomMessage,
-            customFooter: customFooter,
+            customFooter: footer,
             loadOptions: loadUserOptions,
             isSharing: isSharing,
             shareFormTitle: shareFormTitle,

package/dist/esm/components/ShareForm.js

@@ -10,9 +10,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 
-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) { _defineProperty(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) { _defineProperty(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 = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -21,6 +21,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl-next';
 import styled from 'styled-components';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/custom-theme-button';
 import Form from '@atlaskit/form';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
@@ -30,6 +31,7 @@ import { gridSize } from '@atlaskit/theme/constants';
 import Tooltip from '@atlaskit/tooltip';
 import { messages } from '../i18n';
 import { TabType } from '../types';
+import { ANALYTICS_SOURCE, INTEGRATION_MODAL_SOURCE } from './analytics';
 import { CommentField } from './CommentField';
 import CopyLinkButton from './CopyLinkButton';
 import { IntegrationForm } from './IntegrationForm';
@@ -37,13 +39,11 @@ import { ShareHeader } from './ShareHeader';
 import { UserPickerField } from './UserPickerField';
 var SubmitButtonWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  margin-left: auto;\n"])));
 var CenterAlignedIconWrapper = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  display: flex;\n  align-self: center;\n  padding: 0 10px;\n\n  > div {\n    line-height: 1;\n  }\n"])));
-export var FormWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\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 ? gridSize() : gridSize() * 2;
-});
+export var FormWrapper = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\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"])), gridSize());
 export var FormFooter = styled.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  margin-bottom: ", "px;\n  display: flex;\n  justify-content: flex-start;\n"])), gridSize);
 var FormField = styled.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin-bottom: 12px;\n"])));
 var IntegrationWrapper = styled.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n"])));
-var IntegrationIconWrapper = styled.span(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  margin-bottom: -2px;\n  margin-right: 5px;\n"])));
+var IntegrationIconWrapper = styled.span(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  margin-bottom: -6px;\n  margin-right: 5px;\n"])));
 
 var integrationTabText = function integrationTabText(integrationName) {
   return /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.shareInIntegrationButtonText, {
@@ -98,7 +98,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           isPublicLink = _this$props.isPublicLink,
           copyTooltipText = _this$props.copyTooltipText,
           helperMessage = _this$props.helperMessage;
-      return /*#__PURE__*/React.createElement("form", formProps, showTitle && /*#__PURE__*/React.createElement(ShareHeader, {
+      return /*#__PURE__*/React.createElement(AnalyticsContext, {
+        data: {
+          source: ANALYTICS_SOURCE
+        }
+      }, /*#__PURE__*/React.createElement("form", formProps, showTitle && /*#__PURE__*/React.createElement(ShareHeader, {
         title: title
       }), /*#__PURE__*/React.createElement(FormField, null, /*#__PURE__*/React.createElement(UserPickerField, {
         onInputChange: onUserInputChange,
@@ -122,7 +126,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
         link: copyLink,
         isPublicLink: isPublicLink,
         copyTooltipText: copyTooltipText
-      }), _this.renderSubmitButton()));
+      }), _this.renderSubmitButton())));
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderSubmitButton", function () {
@@ -132,10 +136,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 ? messages.formSendPublic : messages.formSend;
+      var tabMode = integrationMode === 'tabs';
+      var formPublicLabel = tabMode ? messages.formSharePublic : messages.formSendPublic;
+      var formSendLabel = tabMode ? messages.formShare : messages.formSend;
+      var sendLabel = isPublicLink ? formPublicLabel : formSendLabel;
       var buttonLabel = shareError ? messages.formRetry : sendLabel;
       var ButtonLabelWrapper = buttonAppearance === 'warning' ? 'strong' : React.Fragment;
       return /*#__PURE__*/React.createElement(SubmitButtonWrapper, null, /*#__PURE__*/React.createElement(CenterAlignedIconWrapper, null, shouldShowWarning && /*#__PURE__*/React.createElement(Tooltip, {
@@ -170,9 +178,13 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_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;
@@ -181,9 +193,9 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(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());
@@ -192,14 +204,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();
@@ -210,11 +219,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
       if (integrationMode === 'tabs') {
         return /*#__PURE__*/React.createElement(Tabs, {
           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.createElement(TabList, null, /*#__PURE__*/React.createElement(Tab, {
           key: "share-tab-default"
@@ -222,21 +227,19 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           key: "share-tab-".concat(firstIntegration.type)
         }, /*#__PURE__*/React.createElement(IntegrationWrapper, null, /*#__PURE__*/React.createElement(IntegrationIconWrapper, null, /*#__PURE__*/React.createElement(firstIntegration.Icon, null)), integrationTabText(firstIntegration.type)))), /*#__PURE__*/React.createElement(TabPanel, {
           key: "share-tabPanel-default"
-        }, /*#__PURE__*/React.createElement(FormWrapper, {
-          isMainShare: true
-        }, this.renderShareForm())), /*#__PURE__*/React.createElement(TabPanel, {
+        }, /*#__PURE__*/React.createElement(FormWrapper, null, this.renderShareForm())), /*#__PURE__*/React.createElement(TabPanel, {
           key: "share-tabPanel-integration"
-        }, /*#__PURE__*/React.createElement(FormWrapper, {
-          isMainShare: false
-        }, /*#__PURE__*/React.createElement(IntegrationForm, {
+        }, /*#__PURE__*/React.createElement(AnalyticsContext, {
+          data: {
+            source: INTEGRATION_MODAL_SOURCE
+          }
+        }, /*#__PURE__*/React.createElement(FormWrapper, null, /*#__PURE__*/React.createElement(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/esm/components/SplitButton.js

@@ -1,6 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
+var _excluded = ["triggerRef"];
 
 var _templateObject, _templateObject2, _templateObject3;
 
@@ -52,7 +53,7 @@ var SplitButtonDropdown = function SplitButtonDropdown(props) {
     testId: "split-button-dropdown",
     trigger: function trigger(_ref2) {
       var triggerRef = _ref2.triggerRef,
-          providedProps = _objectWithoutProperties(_ref2, ["triggerRef"]);
+          providedProps = _objectWithoutProperties(_ref2, _excluded);
 
       return /*#__PURE__*/React.createElement(Button, _extends({}, providedProps, {
         ref: triggerRef,

package/dist/esm/components/analytics.js

@@ -1,8 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-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) { _defineProperty(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) { _defineProperty(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; }
 
 import { isEmail, isTeam, isUser } from '@atlaskit/user-picker';
 import { name as packageName, version as packageVersion } from '../version.json';
@@ -38,7 +38,7 @@ var createScreenEvent = function createScreenEvent(name) {
 
 export var CHANNEL_ID = 'fabric-elements';
 export var ANALYTICS_SOURCE = 'shareModal';
-export var INTEGRATION_MODAL_SOURCE = 'integrationShareModal';
+export var INTEGRATION_MODAL_SOURCE = 'integrationShareDialog';
 export var screenEvent = function screenEvent(_ref) {
   var _ref$isPublicLink = _ref.isPublicLink,
       isPublicLink = _ref$isPublicLink === void 0 ? false : _ref$isPublicLink;

package/dist/esm/components/styles.js

@@ -1,10 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["buttonStyles"];
 
-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) { _defineProperty(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) { _defineProperty(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; }
 
 import React from 'react';
 import Button from '@atlaskit/button/custom-theme-button';
@@ -16,7 +17,7 @@ var StyledButton = /*#__PURE__*/React.forwardRef(function (props, ref) {
     theme: function theme(currentTheme, themeProps) {
       var _currentTheme = currentTheme(themeProps),
           buttonStyles = _currentTheme.buttonStyles,
-          rest = _objectWithoutProperties(_currentTheme, ["buttonStyles"]);
+          rest = _objectWithoutProperties(_currentTheme, _excluded);
 
       return _objectSpread({
         buttonStyles: _objectSpread(_objectSpread({}, buttonStyles), {}, {

package/dist/esm/components/utils.js

@@ -53,4 +53,9 @@ export var optionDataToUsers = function optionDataToUsers(optionDataArray) {
 };
 export var allowEmails = function allowEmails(config) {
   return !(config && config.disableSharingToEmails);
+};
+export var resolveShareFooter = function resolveShareFooter(integrationMode, tabIndex, customFooter) {
+  if (integrationMode === 'tabs' && tabIndex === 0 && customFooter) {
+    return customFooter;
+  }
 };