@atlaskit/share 3.0.6 → 3.0.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/share
 
+## 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

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

@@ -58,7 +58,7 @@ 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(_ShareFormWrapper.ShareFormWrapper, {
     footer: footer // form title will be determined by `title` and `showTitle` prop passed to `ShareForm`,

package/dist/cjs/components/ShareDialogWithTrigger.js

@@ -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,
@@ -450,7 +455,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 +472,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

@@ -225,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;
   }
@@ -235,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());
@@ -246,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();
@@ -264,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"
@@ -287,9 +284,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           onIntegrationClose: function onIntegrationClose() {
             return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
           },
-          changeTab: function changeTab(index) {
-            _this2.changeTab(index);
-          }
+          changeTab: this.changeTab
         })))));
       }
 

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/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/share",
-	"version": "3.0.6"
+	"version": "3.0.7"
 }

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

@@ -47,7 +47,7 @@ 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));
+  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

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", () => {
@@ -410,7 +414,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 +430,7 @@ export class ShareDialogWithTriggerInternal extends React.PureComponent {
         copyLink: copyLink,
         showIntegrationForm: showIntegrationForm,
         bottomMessage: bottomMessage,
-        customFooter: customFooter,
+        customFooter: footer,
         loadOptions: loadUserOptions,
         isSharing: isSharing,
         shareFormTitle: shareFormTitle,

package/dist/es2019/components/ShareForm.js

@@ -183,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);
     });
   }
 
@@ -204,7 +207,6 @@ class InternalForm extends React.PureComponent {
     const {
       integrationMode = 'off',
       shareIntegrations,
-      onTabChange,
       handleCloseDialog
     } = this.props;
 
@@ -217,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`
@@ -237,9 +236,7 @@ class InternalForm extends React.PureComponent {
       }, /*#__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
       })))));
     }
 

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/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/share",
-	"version": "3.0.6"
+	"version": "3.0.7"
 }

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

@@ -42,7 +42,7 @@ 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));
+  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

package/dist/esm/components/ShareDialogWithTrigger.js

@@ -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 () {
@@ -436,7 +441,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 +458,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

@@ -178,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;
@@ -189,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());
@@ -200,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();
@@ -218,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"
@@ -241,9 +238,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
           onIntegrationClose: function onIntegrationClose() {
             return handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog();
           },
-          changeTab: function changeTab(index) {
-            _this2.changeTab(index);
-          }
+          changeTab: this.changeTab
         })))));
       }
 

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;
+  }
 };

package/dist/esm/version.json

@@ -1,4 +1,4 @@
 {
 	"name": "@atlaskit/share",
-	"version": "3.0.6"
+	"version": "3.0.7"
 }

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

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { OptionData } from '@atlaskit/user-picker';
 import { ConfigResponse, User } from '../types';
+import type { IntegrationMode } from '../types/ShareEntities';
 /**
  * We need to generate correct zIndex, for the PopUp and for the Select inside it.
  * The PopUp's defaults to `layers.layer()` from @atlaskit/theme. But if user provides
@@ -16,3 +17,4 @@ export declare const generateSelectZIndex: (dialogZIndex?: number | undefined) =
 export declare const getMenuPortalTargetCurrentHTML: (ref?: ((instance: HTMLDivElement | null) => void) | import("react").RefObject<HTMLDivElement> | null | undefined) => HTMLDivElement | null;
 export declare const optionDataToUsers: (optionDataArray: OptionData[]) => User[];
 export declare const allowEmails: (config?: ConfigResponse | undefined) => boolean;
+export declare const resolveShareFooter: (integrationMode: IntegrationMode | undefined, tabIndex: number, customFooter: React.ReactNode) => React.ReactNode | undefined;

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

@@ -40,4 +40,5 @@ export declare type ShareDialogWithTriggerStates = {
     isUsingSplitButton: boolean;
     showIntegrationForm: boolean;
     selectedIntegration: Integration | null;
+    tabIndex: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/share",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Fabric Share Element",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"