@atlaskit/share 6.12.0 → 6.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/cjs/components/CopyLinkButton.js +1 -1
- package/dist/cjs/components/CopyLinkButtonNext.js +3 -2
- package/dist/cjs/components/ShareDialogContainer.js +9 -2
- package/dist/cjs/components/ShareForm.js +4 -5
- package/dist/cjs/components/ShareFormNext.js +4 -5
- package/dist/cjs/components/ShareFormWrapper/compiled.js +4 -7
- package/dist/cjs/components/ShareFormWrapper/styled.js +2 -5
- package/dist/cjs/components/ShareHeader.js +1 -1
- package/dist/cjs/components/analytics/analytics.js +1 -1
- package/dist/es2019/components/CopyLinkButton.js +1 -1
- package/dist/es2019/components/CopyLinkButtonNext.js +3 -2
- package/dist/es2019/components/ShareDialogContainer.js +9 -2
- package/dist/es2019/components/ShareForm.js +4 -5
- package/dist/es2019/components/ShareFormNext.js +4 -5
- package/dist/es2019/components/ShareFormWrapper/compiled.js +4 -7
- package/dist/es2019/components/ShareFormWrapper/styled.js +2 -5
- package/dist/es2019/components/ShareHeader.js +1 -1
- package/dist/es2019/components/analytics/analytics.js +1 -1
- package/dist/esm/components/CopyLinkButton.js +1 -1
- package/dist/esm/components/CopyLinkButtonNext.js +3 -2
- package/dist/esm/components/ShareDialogContainer.js +9 -2
- package/dist/esm/components/ShareForm.js +4 -5
- package/dist/esm/components/ShareFormNext.js +4 -5
- package/dist/esm/components/ShareFormWrapper/compiled.js +4 -7
- package/dist/esm/components/ShareFormWrapper/styled.js +2 -5
- package/dist/esm/components/ShareHeader.js +1 -1
- package/dist/esm/components/analytics/analytics.js +1 -1
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/share
|
|
2
2
|
|
|
3
|
+
## 6.14.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#177483](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/177483)
|
|
8
|
+
[`a253b30d18585`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a253b30d18585) -
|
|
9
|
+
[ux] Update extended share dialog header offset
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#176250](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/176250)
|
|
14
|
+
[`6ad5979076014`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ad5979076014) -
|
|
15
|
+
clean plan smartlinks feature gate
|
|
16
|
+
|
|
17
|
+
## 6.13.0
|
|
18
|
+
|
|
19
|
+
### Minor Changes
|
|
20
|
+
|
|
21
|
+
- [#175527](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/175527)
|
|
22
|
+
[`4747c395fd276`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4747c395fd276) -
|
|
23
|
+
[ux] Update compiled migrated button styles for the extended variant
|
|
24
|
+
|
|
3
25
|
## 6.12.0
|
|
4
26
|
|
|
5
27
|
### Minor Changes
|
|
@@ -129,7 +129,7 @@ var CopyLinkButtonInner = exports.CopyLinkButtonInner = /*#__PURE__*/function (_
|
|
|
129
129
|
xcss: isExtendedShareDialogEnabled ? [boxWrapperStyle, copyIconContainerStyles] : boxWrapperStyle
|
|
130
130
|
}, (0, _react2.jsx)(_linkLinkFilled.default, {
|
|
131
131
|
LEGACY_margin: "0 ".concat("var(--ds-space-negative-025, -2px)", " 0 0"),
|
|
132
|
-
color: "currentColor
|
|
132
|
+
color: isExtendedShareDialogEnabled ? "var(--ds-text-subtle, #44546F)" : 'currentColor',
|
|
133
133
|
label: "",
|
|
134
134
|
LEGACY_size: "medium"
|
|
135
135
|
})),
|
|
@@ -117,7 +117,7 @@ var CopyLinkButton = exports.CopyLinkButton = /*#__PURE__*/function (_React$Comp
|
|
|
117
117
|
xcss: (0, _css.cx)(isExtendedShareDialogEnabled ? styles.copyIconContainerStyles : styles.boxWrapper)
|
|
118
118
|
}, /*#__PURE__*/_react.default.createElement(_linkLinkFilled.default, {
|
|
119
119
|
LEGACY_margin: "0 ".concat("var(--ds-space-negative-025, -2px)", " 0 0"),
|
|
120
|
-
color: "currentColor
|
|
120
|
+
color: isExtendedShareDialogEnabled ? "var(--ds-text-subtle, #44546F)" : 'currentColor',
|
|
121
121
|
label: "",
|
|
122
122
|
LEGACY_size: "medium"
|
|
123
123
|
})),
|
|
@@ -128,7 +128,8 @@ var CopyLinkButton = exports.CopyLinkButton = /*#__PURE__*/function (_React$Comp
|
|
|
128
128
|
return {
|
|
129
129
|
buttonStyles: _objectSpread(_objectSpread({}, current(themeProps).buttonStyles), {}, {
|
|
130
130
|
color: "var(--ds-text, #172B4D)",
|
|
131
|
-
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
131
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
|
|
132
|
+
alignItems: 'center'
|
|
132
133
|
}),
|
|
133
134
|
spinnerStyles: current(themeProps).spinnerStyles
|
|
134
135
|
};
|
|
@@ -22,6 +22,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
|
|
|
22
22
|
var _reactIntlNext = require("react-intl-next");
|
|
23
23
|
var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
|
|
24
24
|
var _analyticsNext = require("@atlaskit/analytics-next");
|
|
25
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
25
26
|
var _AtlassianUrlShortenerClient = require("../clients/AtlassianUrlShortenerClient");
|
|
26
27
|
var _ShareServiceClient = require("../clients/ShareServiceClient");
|
|
27
28
|
var _i18n = require("../i18n");
|
|
@@ -222,8 +223,14 @@ var ShareDialogContainerInternal = exports.ShareDialogContainerInternal = /*#__P
|
|
|
222
223
|
});
|
|
223
224
|
}, _fastDeepEqual.default));
|
|
224
225
|
(0, _defineProperty2.default)(_this, "getFormShareLink", function () {
|
|
225
|
-
|
|
226
|
-
|
|
226
|
+
var rawLink = _this.getRawLink();
|
|
227
|
+
// Check if origin tracing on share link is enabled
|
|
228
|
+
if ((0, _platformFeatureFlags.fg)('page_shared_event_from_share_dialogue')) {
|
|
229
|
+
var originTracing = _this.getFormShareOriginTracing();
|
|
230
|
+
return memoizedFormatCopyLink(originTracing, rawLink);
|
|
231
|
+
}
|
|
232
|
+
// original share link is used if feature flag is disabled
|
|
233
|
+
return rawLink;
|
|
227
234
|
});
|
|
228
235
|
(0, _tinyInvariant.default)(!props.client, 'elements/share: Breaking change, please update your props!');
|
|
229
236
|
_this.shareClient = props.shareClient || new _ShareServiceClient.ShareServiceClient();
|
|
@@ -22,7 +22,6 @@ var _form = _interopRequireWildcard(require("@atlaskit/form"));
|
|
|
22
22
|
var _email = _interopRequireDefault(require("@atlaskit/icon/core/migration/email"));
|
|
23
23
|
var _error = _interopRequireDefault(require("@atlaskit/icon/core/migration/error"));
|
|
24
24
|
var _menu = require("@atlaskit/menu");
|
|
25
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
26
25
|
var _primitives = require("@atlaskit/primitives");
|
|
27
26
|
var _tabs = _interopRequireWildcard(require("@atlaskit/tabs"));
|
|
28
27
|
var _colors = require("@atlaskit/theme/colors");
|
|
@@ -391,11 +390,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
391
390
|
}, (0, _react2.jsx)("span", {
|
|
392
391
|
css: integrationIconWrapperStyles
|
|
393
392
|
}, (0, _react2.jsx)(integration.Icon, null)), integrationTabText(integration.type)));
|
|
394
|
-
}),
|
|
393
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
395
394
|
return (0, _react2.jsx)(_tabs.Tab, {
|
|
396
395
|
key: "share-tab-".concat(tab.label)
|
|
397
396
|
}, tab.label);
|
|
398
|
-
}))
|
|
397
|
+
})), (0, _react2.jsx)(_tabs.TabPanel, {
|
|
399
398
|
key: "share-tabPanel-default"
|
|
400
399
|
}, (0, _react2.jsx)("div", {
|
|
401
400
|
css: formWrapperStyles
|
|
@@ -423,7 +422,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
423
422
|
},
|
|
424
423
|
changeTab: _this2.changeTab
|
|
425
424
|
})))));
|
|
426
|
-
}),
|
|
425
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
427
426
|
return (0, _react2.jsx)(_tabs.TabPanel, {
|
|
428
427
|
key: "share-tabPanel-".concat(tab.label)
|
|
429
428
|
}, (0, _react2.jsx)("div", {
|
|
@@ -435,7 +434,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
435
434
|
},
|
|
436
435
|
changeTab: _this2.changeTab
|
|
437
436
|
})));
|
|
438
|
-
}))
|
|
437
|
+
}));
|
|
439
438
|
}
|
|
440
439
|
return this.renderShareForm();
|
|
441
440
|
}
|
|
@@ -25,7 +25,6 @@ var _form = _interopRequireWildcard(require("@atlaskit/form"));
|
|
|
25
25
|
var _email = _interopRequireDefault(require("@atlaskit/icon/core/migration/email"));
|
|
26
26
|
var _error = _interopRequireDefault(require("@atlaskit/icon/core/migration/error"));
|
|
27
27
|
var _menu = require("@atlaskit/menu");
|
|
28
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
29
28
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
30
29
|
var _tabs = _interopRequireWildcard(require("@atlaskit/tabs"));
|
|
31
30
|
var _colors = require("@atlaskit/theme/colors");
|
|
@@ -300,11 +299,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
300
299
|
as: "span",
|
|
301
300
|
xcss: (0, _css.cx)(styles.integrationIconWrapperStyles)
|
|
302
301
|
}, /*#__PURE__*/_react.default.createElement(integration.Icon, null)), integrationTabText(integration.type)));
|
|
303
|
-
}),
|
|
302
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
304
303
|
return /*#__PURE__*/_react.default.createElement(_tabs.Tab, {
|
|
305
304
|
key: "share-tab-".concat(tab.label)
|
|
306
305
|
}, tab.label);
|
|
307
|
-
}))
|
|
306
|
+
})), /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
|
|
308
307
|
key: "share-tabPanel-default"
|
|
309
308
|
}, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
310
309
|
xcss: (0, _css.cx)(styles.formWrapperStyles)
|
|
@@ -332,7 +331,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
332
331
|
},
|
|
333
332
|
changeTab: _this2.changeTab
|
|
334
333
|
})))));
|
|
335
|
-
}),
|
|
334
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
336
335
|
return /*#__PURE__*/_react.default.createElement(_tabs.TabPanel, {
|
|
337
336
|
key: "share-tabPanel-".concat(tab.label)
|
|
338
337
|
}, /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
@@ -344,7 +343,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
344
343
|
},
|
|
345
344
|
changeTab: _this2.changeTab
|
|
346
345
|
})));
|
|
347
|
-
}))
|
|
346
|
+
}));
|
|
348
347
|
}
|
|
349
348
|
return this.renderShareForm();
|
|
350
349
|
}
|
|
@@ -10,7 +10,6 @@ require("./compiled.compiled.css");
|
|
|
10
10
|
var _runtime = require("@compiled/react/runtime");
|
|
11
11
|
var _react = _interopRequireDefault(require("react"));
|
|
12
12
|
var _css = require("@atlaskit/css");
|
|
13
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
14
13
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
15
14
|
var styles = {
|
|
16
15
|
menuNotSelectedAndMenuIntegration: "_1bsbpk3t",
|
|
@@ -30,12 +29,10 @@ var InlineDialogFormWrapper = exports.InlineDialogFormWrapper = function InlineD
|
|
|
30
29
|
xcss: (0, _css.cx)(styles.menuNotSelectedAndMenuIntegration)
|
|
31
30
|
}, children);
|
|
32
31
|
}
|
|
33
|
-
if (
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}, children);
|
|
38
|
-
}
|
|
32
|
+
if (integrationMode === 'tabs') {
|
|
33
|
+
return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
34
|
+
xcss: (0, _css.cx)(styles.tabsIntegration)
|
|
35
|
+
}, children);
|
|
39
36
|
}
|
|
40
37
|
return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
41
38
|
xcss: (0, _css.cx)(isExtendedShareDialogEnabled ? styles.extendedDefault : styles.default)
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.InlineDialogFormWrapper = exports.InlineDialogContentWrapper = void 0;
|
|
7
7
|
var _react = require("@emotion/react");
|
|
8
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
9
8
|
var _ShareMenuItem = require("../ShareMenuItem");
|
|
10
9
|
/**
|
|
11
10
|
* @jsxRuntime classic
|
|
@@ -27,10 +26,8 @@ var calculateFormWrapperWidth = function calculateFormWrapperWidth(_ref) {
|
|
|
27
26
|
if (!isMenuItemSelected && integrationMode === 'menu') {
|
|
28
27
|
return _ShareMenuItem.menuWrapperWidth;
|
|
29
28
|
}
|
|
30
|
-
if (
|
|
31
|
-
|
|
32
|
-
return 'auto';
|
|
33
|
-
}
|
|
29
|
+
if (integrationMode === 'tabs') {
|
|
30
|
+
return 'auto';
|
|
34
31
|
}
|
|
35
32
|
return formWidth;
|
|
36
33
|
};
|
|
@@ -22,7 +22,7 @@ var headerWrapperStyles = (0, _primitives.xcss)({
|
|
|
22
22
|
lineHeight: 'space.400'
|
|
23
23
|
});
|
|
24
24
|
var headerWrapperExtraSpaceStyles = (0, _primitives.xcss)({
|
|
25
|
-
marginBottom: 'space.
|
|
25
|
+
marginBottom: 'space.150',
|
|
26
26
|
color: 'color.text'
|
|
27
27
|
});
|
|
28
28
|
var ShareHeader = exports.ShareHeader = function ShareHeader(_ref) {
|
|
@@ -13,7 +13,7 @@ var buildAttributes = function buildAttributes() {
|
|
|
13
13
|
var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
14
14
|
return _objectSpread({
|
|
15
15
|
packageName: "@atlaskit/share",
|
|
16
|
-
packageVersion: "6.
|
|
16
|
+
packageVersion: "6.13.0"
|
|
17
17
|
}, attributes);
|
|
18
18
|
};
|
|
19
19
|
var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {
|
|
@@ -111,7 +111,7 @@ export class CopyLinkButtonInner extends React.Component {
|
|
|
111
111
|
xcss: isExtendedShareDialogEnabled ? [boxWrapperStyle, copyIconContainerStyles] : boxWrapperStyle
|
|
112
112
|
}, jsx(LinkFilledIcon, {
|
|
113
113
|
LEGACY_margin: `0 ${"var(--ds-space-negative-025, -2px)"} 0 0`,
|
|
114
|
-
color: "currentColor
|
|
114
|
+
color: isExtendedShareDialogEnabled ? "var(--ds-text-subtle, #44546F)" : 'currentColor',
|
|
115
115
|
label: "",
|
|
116
116
|
LEGACY_size: "medium"
|
|
117
117
|
})),
|
|
@@ -95,7 +95,7 @@ export class CopyLinkButton extends React.Component {
|
|
|
95
95
|
xcss: cx(isExtendedShareDialogEnabled ? styles.copyIconContainerStyles : styles.boxWrapper)
|
|
96
96
|
}, /*#__PURE__*/React.createElement(LinkFilledIcon, {
|
|
97
97
|
LEGACY_margin: `0 ${"var(--ds-space-negative-025, -2px)"} 0 0`,
|
|
98
|
-
color: "currentColor
|
|
98
|
+
color: isExtendedShareDialogEnabled ? "var(--ds-text-subtle, #44546F)" : 'currentColor',
|
|
99
99
|
label: "",
|
|
100
100
|
LEGACY_size: "medium"
|
|
101
101
|
})),
|
|
@@ -106,7 +106,8 @@ export class CopyLinkButton extends React.Component {
|
|
|
106
106
|
buttonStyles: {
|
|
107
107
|
...current(themeProps).buttonStyles,
|
|
108
108
|
color: "var(--ds-text, #172B4D)",
|
|
109
|
-
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
109
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
|
|
110
|
+
alignItems: 'center'
|
|
110
111
|
},
|
|
111
112
|
spinnerStyles: current(themeProps).spinnerStyles
|
|
112
113
|
}) : undefined
|
|
@@ -5,6 +5,7 @@ import memoizeOne from 'memoize-one';
|
|
|
5
5
|
import { FormattedMessage } from 'react-intl-next';
|
|
6
6
|
import assert from 'tiny-invariant';
|
|
7
7
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
8
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
9
|
import { AtlassianUrlShortenerClient } from '../clients/AtlassianUrlShortenerClient';
|
|
9
10
|
import { ShareServiceClient } from '../clients/ShareServiceClient';
|
|
10
11
|
import { messages } from '../i18n';
|
|
@@ -182,8 +183,14 @@ export class ShareDialogContainerInternal extends React.Component {
|
|
|
182
183
|
});
|
|
183
184
|
}, deepEqual));
|
|
184
185
|
_defineProperty(this, "getFormShareLink", () => {
|
|
185
|
-
|
|
186
|
-
|
|
186
|
+
const rawLink = this.getRawLink();
|
|
187
|
+
// Check if origin tracing on share link is enabled
|
|
188
|
+
if (fg('page_shared_event_from_share_dialogue')) {
|
|
189
|
+
const originTracing = this.getFormShareOriginTracing();
|
|
190
|
+
return memoizedFormatCopyLink(originTracing, rawLink);
|
|
191
|
+
}
|
|
192
|
+
// original share link is used if feature flag is disabled
|
|
193
|
+
return rawLink;
|
|
187
194
|
});
|
|
188
195
|
assert(!props.client, 'elements/share: Breaking change, please update your props!');
|
|
189
196
|
this.shareClient = props.shareClient || new ShareServiceClient();
|
|
@@ -15,7 +15,6 @@ import Form, { RequiredAsterisk } from '@atlaskit/form';
|
|
|
15
15
|
import EmailIcon from '@atlaskit/icon/core/migration/email';
|
|
16
16
|
import ErrorIcon from '@atlaskit/icon/core/migration/error';
|
|
17
17
|
import { MenuGroup } from '@atlaskit/menu';
|
|
18
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
19
18
|
import { Box, Inline, xcss } from '@atlaskit/primitives';
|
|
20
19
|
import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
|
|
21
20
|
import { N300, R400 } from '@atlaskit/theme/colors';
|
|
@@ -367,9 +366,9 @@ class InternalForm extends React.PureComponent {
|
|
|
367
366
|
css: integrationWrapperStyles
|
|
368
367
|
}, jsx("span", {
|
|
369
368
|
css: integrationIconWrapperStyles
|
|
370
|
-
}, jsx(integration.Icon, null)), integrationTabText(integration.type)))),
|
|
369
|
+
}, jsx(integration.Icon, null)), integrationTabText(integration.type)))), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => jsx(Tab, {
|
|
371
370
|
key: `share-tab-${tab.label}`
|
|
372
|
-
}, tab.label)))
|
|
371
|
+
}, tab.label))), jsx(TabPanel, {
|
|
373
372
|
key: `share-tabPanel-default`
|
|
374
373
|
}, jsx("div", {
|
|
375
374
|
css: formWrapperStyles
|
|
@@ -393,7 +392,7 @@ class InternalForm extends React.PureComponent {
|
|
|
393
392
|
Content: integration.Content,
|
|
394
393
|
onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
|
|
395
394
|
changeTab: this.changeTab
|
|
396
|
-
})))))),
|
|
395
|
+
})))))), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => jsx(TabPanel, {
|
|
397
396
|
key: `share-tabPanel-${tab.label}`
|
|
398
397
|
}, jsx("div", {
|
|
399
398
|
css: formWrapperStyles
|
|
@@ -401,7 +400,7 @@ class InternalForm extends React.PureComponent {
|
|
|
401
400
|
Content: tab.Content,
|
|
402
401
|
onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
|
|
403
402
|
changeTab: this.changeTab
|
|
404
|
-
})))))
|
|
403
|
+
})))));
|
|
405
404
|
}
|
|
406
405
|
return this.renderShareForm();
|
|
407
406
|
}
|
|
@@ -12,7 +12,6 @@ import Form, { RequiredAsterisk } from '@atlaskit/form';
|
|
|
12
12
|
import EmailIcon from '@atlaskit/icon/core/migration/email';
|
|
13
13
|
import ErrorIcon from '@atlaskit/icon/core/migration/error';
|
|
14
14
|
import { MenuGroup } from '@atlaskit/menu';
|
|
15
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
16
15
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
17
16
|
import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
|
|
18
17
|
import { N300, R400 } from '@atlaskit/theme/colors';
|
|
@@ -273,9 +272,9 @@ class InternalForm extends React.PureComponent {
|
|
|
273
272
|
}, /*#__PURE__*/React.createElement(Box, {
|
|
274
273
|
as: "span",
|
|
275
274
|
xcss: cx(styles.integrationIconWrapperStyles)
|
|
276
|
-
}, /*#__PURE__*/React.createElement(integration.Icon, null)), integrationTabText(integration.type)))),
|
|
275
|
+
}, /*#__PURE__*/React.createElement(integration.Icon, null)), integrationTabText(integration.type)))), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => /*#__PURE__*/React.createElement(Tab, {
|
|
277
276
|
key: `share-tab-${tab.label}`
|
|
278
|
-
}, tab.label)))
|
|
277
|
+
}, tab.label))), /*#__PURE__*/React.createElement(TabPanel, {
|
|
279
278
|
key: `share-tabPanel-default`
|
|
280
279
|
}, /*#__PURE__*/React.createElement(Box, {
|
|
281
280
|
xcss: cx(styles.formWrapperStyles)
|
|
@@ -299,7 +298,7 @@ class InternalForm extends React.PureComponent {
|
|
|
299
298
|
Content: integration.Content,
|
|
300
299
|
onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
|
|
301
300
|
changeTab: this.changeTab
|
|
302
|
-
})))))),
|
|
301
|
+
})))))), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(tab => /*#__PURE__*/React.createElement(TabPanel, {
|
|
303
302
|
key: `share-tabPanel-${tab.label}`
|
|
304
303
|
}, /*#__PURE__*/React.createElement(Box, {
|
|
305
304
|
xcss: cx(styles.formWrapperStyles)
|
|
@@ -307,7 +306,7 @@ class InternalForm extends React.PureComponent {
|
|
|
307
306
|
Content: tab.Content,
|
|
308
307
|
onIntegrationClose: () => handleCloseDialog === null || handleCloseDialog === void 0 ? void 0 : handleCloseDialog(),
|
|
309
308
|
changeTab: this.changeTab
|
|
310
|
-
})))))
|
|
309
|
+
})))));
|
|
311
310
|
}
|
|
312
311
|
return this.renderShareForm();
|
|
313
312
|
}
|
|
@@ -3,7 +3,6 @@ import "./compiled.compiled.css";
|
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { cx } from '@atlaskit/css';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
8
7
|
const styles = {
|
|
9
8
|
menuNotSelectedAndMenuIntegration: "_1bsbpk3t",
|
|
@@ -24,12 +23,10 @@ export const InlineDialogFormWrapper = ({
|
|
|
24
23
|
xcss: cx(styles.menuNotSelectedAndMenuIntegration)
|
|
25
24
|
}, children);
|
|
26
25
|
}
|
|
27
|
-
if (
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}, children);
|
|
32
|
-
}
|
|
26
|
+
if (integrationMode === 'tabs') {
|
|
27
|
+
return /*#__PURE__*/React.createElement(Box, {
|
|
28
|
+
xcss: cx(styles.tabsIntegration)
|
|
29
|
+
}, children);
|
|
33
30
|
}
|
|
34
31
|
return /*#__PURE__*/React.createElement(Box, {
|
|
35
32
|
xcss: cx(isExtendedShareDialogEnabled ? styles.extendedDefault : styles.default)
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
|
|
6
6
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
7
7
|
import { css, jsx } from '@emotion/react';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { menuWrapperWidth } from '../ShareMenuItem';
|
|
10
9
|
|
|
11
10
|
/**
|
|
@@ -22,10 +21,8 @@ const calculateFormWrapperWidth = ({
|
|
|
22
21
|
if (!isMenuItemSelected && integrationMode === 'menu') {
|
|
23
22
|
return menuWrapperWidth;
|
|
24
23
|
}
|
|
25
|
-
if (
|
|
26
|
-
|
|
27
|
-
return 'auto';
|
|
28
|
-
}
|
|
24
|
+
if (integrationMode === 'tabs') {
|
|
25
|
+
return 'auto';
|
|
29
26
|
}
|
|
30
27
|
return formWidth;
|
|
31
28
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isEmail, isExternalUser, isGroup, isTeam, isUser } from '@atlaskit/smart-user-picker';
|
|
2
2
|
const buildAttributes = (attributes = {}) => ({
|
|
3
3
|
packageName: "@atlaskit/share",
|
|
4
|
-
packageVersion: "6.
|
|
4
|
+
packageVersion: "6.13.0",
|
|
5
5
|
...attributes
|
|
6
6
|
});
|
|
7
7
|
const createEvent = (eventType, source, action, actionSubject, actionSubjectId, attributes = {}) => ({
|
|
@@ -125,7 +125,7 @@ export var CopyLinkButtonInner = /*#__PURE__*/function (_React$Component) {
|
|
|
125
125
|
xcss: isExtendedShareDialogEnabled ? [boxWrapperStyle, copyIconContainerStyles] : boxWrapperStyle
|
|
126
126
|
}, jsx(LinkFilledIcon, {
|
|
127
127
|
LEGACY_margin: "0 ".concat("var(--ds-space-negative-025, -2px)", " 0 0"),
|
|
128
|
-
color: "currentColor
|
|
128
|
+
color: isExtendedShareDialogEnabled ? "var(--ds-text-subtle, #44546F)" : 'currentColor',
|
|
129
129
|
label: "",
|
|
130
130
|
LEGACY_size: "medium"
|
|
131
131
|
})),
|
|
@@ -110,7 +110,7 @@ export var CopyLinkButton = /*#__PURE__*/function (_React$Component) {
|
|
|
110
110
|
xcss: cx(isExtendedShareDialogEnabled ? styles.copyIconContainerStyles : styles.boxWrapper)
|
|
111
111
|
}, /*#__PURE__*/React.createElement(LinkFilledIcon, {
|
|
112
112
|
LEGACY_margin: "0 ".concat("var(--ds-space-negative-025, -2px)", " 0 0"),
|
|
113
|
-
color: "currentColor
|
|
113
|
+
color: isExtendedShareDialogEnabled ? "var(--ds-text-subtle, #44546F)" : 'currentColor',
|
|
114
114
|
label: "",
|
|
115
115
|
LEGACY_size: "medium"
|
|
116
116
|
})),
|
|
@@ -121,7 +121,8 @@ export var CopyLinkButton = /*#__PURE__*/function (_React$Component) {
|
|
|
121
121
|
return {
|
|
122
122
|
buttonStyles: _objectSpread(_objectSpread({}, current(themeProps).buttonStyles), {}, {
|
|
123
123
|
color: "var(--ds-text, #172B4D)",
|
|
124
|
-
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
124
|
+
font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
|
|
125
|
+
alignItems: 'center'
|
|
125
126
|
}),
|
|
126
127
|
spinnerStyles: current(themeProps).spinnerStyles
|
|
127
128
|
};
|
|
@@ -20,6 +20,7 @@ import memoizeOne from 'memoize-one';
|
|
|
20
20
|
import { FormattedMessage } from 'react-intl-next';
|
|
21
21
|
import assert from 'tiny-invariant';
|
|
22
22
|
import { withAnalyticsEvents } from '@atlaskit/analytics-next';
|
|
23
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
23
24
|
import { AtlassianUrlShortenerClient } from '../clients/AtlassianUrlShortenerClient';
|
|
24
25
|
import { ShareServiceClient } from '../clients/ShareServiceClient';
|
|
25
26
|
import { messages } from '../i18n';
|
|
@@ -215,8 +216,14 @@ export var ShareDialogContainerInternal = /*#__PURE__*/function (_React$Componen
|
|
|
215
216
|
});
|
|
216
217
|
}, deepEqual));
|
|
217
218
|
_defineProperty(_this, "getFormShareLink", function () {
|
|
218
|
-
|
|
219
|
-
|
|
219
|
+
var rawLink = _this.getRawLink();
|
|
220
|
+
// Check if origin tracing on share link is enabled
|
|
221
|
+
if (fg('page_shared_event_from_share_dialogue')) {
|
|
222
|
+
var originTracing = _this.getFormShareOriginTracing();
|
|
223
|
+
return memoizedFormatCopyLink(originTracing, rawLink);
|
|
224
|
+
}
|
|
225
|
+
// original share link is used if feature flag is disabled
|
|
226
|
+
return rawLink;
|
|
220
227
|
});
|
|
221
228
|
assert(!props.client, 'elements/share: Breaking change, please update your props!');
|
|
222
229
|
_this.shareClient = props.shareClient || new ShareServiceClient();
|
|
@@ -24,7 +24,6 @@ import Form, { RequiredAsterisk } from '@atlaskit/form';
|
|
|
24
24
|
import EmailIcon from '@atlaskit/icon/core/migration/email';
|
|
25
25
|
import ErrorIcon from '@atlaskit/icon/core/migration/error';
|
|
26
26
|
import { MenuGroup } from '@atlaskit/menu';
|
|
27
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
28
27
|
import { Box, Inline, xcss } from '@atlaskit/primitives';
|
|
29
28
|
import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
|
|
30
29
|
import { N300, R400 } from '@atlaskit/theme/colors';
|
|
@@ -385,11 +384,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
385
384
|
}, jsx("span", {
|
|
386
385
|
css: integrationIconWrapperStyles
|
|
387
386
|
}, jsx(integration.Icon, null)), integrationTabText(integration.type)));
|
|
388
|
-
}),
|
|
387
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
389
388
|
return jsx(Tab, {
|
|
390
389
|
key: "share-tab-".concat(tab.label)
|
|
391
390
|
}, tab.label);
|
|
392
|
-
}))
|
|
391
|
+
})), jsx(TabPanel, {
|
|
393
392
|
key: "share-tabPanel-default"
|
|
394
393
|
}, jsx("div", {
|
|
395
394
|
css: formWrapperStyles
|
|
@@ -417,7 +416,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
417
416
|
},
|
|
418
417
|
changeTab: _this2.changeTab
|
|
419
418
|
})))));
|
|
420
|
-
}),
|
|
419
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
421
420
|
return jsx(TabPanel, {
|
|
422
421
|
key: "share-tabPanel-".concat(tab.label)
|
|
423
422
|
}, jsx("div", {
|
|
@@ -429,7 +428,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
429
428
|
},
|
|
430
429
|
changeTab: _this2.changeTab
|
|
431
430
|
})));
|
|
432
|
-
}))
|
|
431
|
+
}));
|
|
433
432
|
}
|
|
434
433
|
return this.renderShareForm();
|
|
435
434
|
}
|
|
@@ -21,7 +21,6 @@ import Form, { RequiredAsterisk } from '@atlaskit/form';
|
|
|
21
21
|
import EmailIcon from '@atlaskit/icon/core/migration/email';
|
|
22
22
|
import ErrorIcon from '@atlaskit/icon/core/migration/error';
|
|
23
23
|
import { MenuGroup } from '@atlaskit/menu';
|
|
24
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
25
24
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
26
25
|
import Tabs, { Tab, TabList, TabPanel } from '@atlaskit/tabs';
|
|
27
26
|
import { N300, R400 } from '@atlaskit/theme/colors';
|
|
@@ -291,11 +290,11 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
291
290
|
as: "span",
|
|
292
291
|
xcss: cx(styles.integrationIconWrapperStyles)
|
|
293
292
|
}, /*#__PURE__*/React.createElement(integration.Icon, null)), integrationTabText(integration.type)));
|
|
294
|
-
}),
|
|
293
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
295
294
|
return /*#__PURE__*/React.createElement(Tab, {
|
|
296
295
|
key: "share-tab-".concat(tab.label)
|
|
297
296
|
}, tab.label);
|
|
298
|
-
}))
|
|
297
|
+
})), /*#__PURE__*/React.createElement(TabPanel, {
|
|
299
298
|
key: "share-tabPanel-default"
|
|
300
299
|
}, /*#__PURE__*/React.createElement(Box, {
|
|
301
300
|
xcss: cx(styles.formWrapperStyles)
|
|
@@ -323,7 +322,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
323
322
|
},
|
|
324
323
|
changeTab: _this2.changeTab
|
|
325
324
|
})))));
|
|
326
|
-
}),
|
|
325
|
+
}), additionalTabs === null || additionalTabs === void 0 ? void 0 : additionalTabs.map(function (tab) {
|
|
327
326
|
return /*#__PURE__*/React.createElement(TabPanel, {
|
|
328
327
|
key: "share-tabPanel-".concat(tab.label)
|
|
329
328
|
}, /*#__PURE__*/React.createElement(Box, {
|
|
@@ -335,7 +334,7 @@ var InternalForm = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
335
334
|
},
|
|
336
335
|
changeTab: _this2.changeTab
|
|
337
336
|
})));
|
|
338
|
-
}))
|
|
337
|
+
}));
|
|
339
338
|
}
|
|
340
339
|
return this.renderShareForm();
|
|
341
340
|
}
|
|
@@ -3,7 +3,6 @@ import "./compiled.compiled.css";
|
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { cx } from '@atlaskit/css';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
8
7
|
var styles = {
|
|
9
8
|
menuNotSelectedAndMenuIntegration: "_1bsbpk3t",
|
|
@@ -23,12 +22,10 @@ export var InlineDialogFormWrapper = function InlineDialogFormWrapper(_ref) {
|
|
|
23
22
|
xcss: cx(styles.menuNotSelectedAndMenuIntegration)
|
|
24
23
|
}, children);
|
|
25
24
|
}
|
|
26
|
-
if (
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}, children);
|
|
31
|
-
}
|
|
25
|
+
if (integrationMode === 'tabs') {
|
|
26
|
+
return /*#__PURE__*/React.createElement(Box, {
|
|
27
|
+
xcss: cx(styles.tabsIntegration)
|
|
28
|
+
}, children);
|
|
32
29
|
}
|
|
33
30
|
return /*#__PURE__*/React.createElement(Box, {
|
|
34
31
|
xcss: cx(isExtendedShareDialogEnabled ? styles.extendedDefault : styles.default)
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
|
|
6
6
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
7
7
|
import { css, jsx } from '@emotion/react';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { menuWrapperWidth } from '../ShareMenuItem';
|
|
10
9
|
|
|
11
10
|
/**
|
|
@@ -21,10 +20,8 @@ var calculateFormWrapperWidth = function calculateFormWrapperWidth(_ref) {
|
|
|
21
20
|
if (!isMenuItemSelected && integrationMode === 'menu') {
|
|
22
21
|
return menuWrapperWidth;
|
|
23
22
|
}
|
|
24
|
-
if (
|
|
25
|
-
|
|
26
|
-
return 'auto';
|
|
27
|
-
}
|
|
23
|
+
if (integrationMode === 'tabs') {
|
|
24
|
+
return 'auto';
|
|
28
25
|
}
|
|
29
26
|
return formWidth;
|
|
30
27
|
};
|
|
@@ -6,7 +6,7 @@ var buildAttributes = function buildAttributes() {
|
|
|
6
6
|
var attributes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
7
7
|
return _objectSpread({
|
|
8
8
|
packageName: "@atlaskit/share",
|
|
9
|
-
packageVersion: "6.
|
|
9
|
+
packageVersion: "6.13.0"
|
|
10
10
|
}, attributes);
|
|
11
11
|
};
|
|
12
12
|
var createEvent = function createEvent(eventType, source, action, actionSubject, actionSubjectId) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/share",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.14.0",
|
|
4
4
|
"description": "Fabric Share Element",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -44,11 +44,11 @@
|
|
|
44
44
|
"@atlaskit/dropdown-menu": "^16.1.0",
|
|
45
45
|
"@atlaskit/form": "^12.0.0",
|
|
46
46
|
"@atlaskit/heading": "^5.2.0",
|
|
47
|
-
"@atlaskit/icon": "^27.
|
|
47
|
+
"@atlaskit/icon": "^27.2.0",
|
|
48
48
|
"@atlaskit/link": "^3.2.0",
|
|
49
49
|
"@atlaskit/menu": "^8.0.0",
|
|
50
50
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
51
|
-
"@atlaskit/popper": "^7.
|
|
51
|
+
"@atlaskit/popper": "^7.1.0",
|
|
52
52
|
"@atlaskit/popup": "^4.3.0",
|
|
53
53
|
"@atlaskit/portal": "^5.1.0",
|
|
54
54
|
"@atlaskit/primitives": "^14.9.0",
|
|
@@ -57,10 +57,10 @@
|
|
|
57
57
|
"@atlaskit/tabs": "^18.1.0",
|
|
58
58
|
"@atlaskit/textarea": "^8.0.0",
|
|
59
59
|
"@atlaskit/theme": "^18.0.0",
|
|
60
|
-
"@atlaskit/tokens": "^5.
|
|
60
|
+
"@atlaskit/tokens": "^5.4.0",
|
|
61
61
|
"@atlaskit/tooltip": "^20.3.0",
|
|
62
62
|
"@atlaskit/ufo": "^0.4.0",
|
|
63
|
-
"@atlaskit/user-picker": "^11.
|
|
63
|
+
"@atlaskit/user-picker": "^11.3.0",
|
|
64
64
|
"@atlaskit/util-service-support": "^6.3.0",
|
|
65
65
|
"@babel/runtime": "^7.0.0",
|
|
66
66
|
"@emotion/react": "^11.7.1",
|
|
@@ -122,9 +122,6 @@
|
|
|
122
122
|
"enable-appropriate-reading-order-in-share-dialog": {
|
|
123
123
|
"type": "boolean"
|
|
124
124
|
},
|
|
125
|
-
"smart_links_for_plans_platform": {
|
|
126
|
-
"type": "boolean"
|
|
127
|
-
},
|
|
128
125
|
"jira-issue-terminology-refresh-m3": {
|
|
129
126
|
"type": "boolean"
|
|
130
127
|
},
|
|
@@ -139,6 +136,9 @@
|
|
|
139
136
|
},
|
|
140
137
|
"should-render-to-parent-should-be-true-people-and-": {
|
|
141
138
|
"type": "boolean"
|
|
139
|
+
},
|
|
140
|
+
"page_shared_event_from_share_dialogue": {
|
|
141
|
+
"type": "boolean"
|
|
142
142
|
}
|
|
143
143
|
},
|
|
144
144
|
"sideEffects": [
|