@atlaskit/link-datasource 3.15.0 → 3.15.1

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.
Files changed (21) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/ui/issue-like-table/render-type/date-time/index.js +4 -11
  3. package/dist/cjs/ui/issue-like-table/render-type/link/index.js +7 -8
  4. package/dist/cjs/ui/issue-like-table/render-type/text/index.js +3 -12
  5. package/dist/cjs/ui/issue-like-table/render-type/user/index.js +1 -3
  6. package/dist/cjs/ui/issue-like-table/styled.js +3 -7
  7. package/dist/es2019/ui/issue-like-table/render-type/date-time/index.js +3 -12
  8. package/dist/es2019/ui/issue-like-table/render-type/link/index.js +5 -6
  9. package/dist/es2019/ui/issue-like-table/render-type/text/index.js +3 -12
  10. package/dist/es2019/ui/issue-like-table/render-type/user/index.js +1 -3
  11. package/dist/es2019/ui/issue-like-table/styled.js +2 -6
  12. package/dist/esm/ui/issue-like-table/render-type/date-time/index.js +3 -12
  13. package/dist/esm/ui/issue-like-table/render-type/link/index.js +7 -8
  14. package/dist/esm/ui/issue-like-table/render-type/text/index.js +3 -12
  15. package/dist/esm/ui/issue-like-table/render-type/user/index.js +1 -3
  16. package/dist/esm/ui/issue-like-table/styled.js +2 -6
  17. package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts +1 -1
  18. package/dist/types/ui/issue-like-table/styled.d.ts +0 -1
  19. package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts +1 -1
  20. package/dist/types-ts4.5/ui/issue-like-table/styled.d.ts +0 -1
  21. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # @atlaskit/link-datasource
2
2
 
3
+ ## 3.15.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#177441](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/177441)
8
+ [`ad9c80eb0aa1f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ad9c80eb0aa1f) -
9
+ Internal changes to typography styles. There may be some minor visual changes to align with
10
+ modernized typography styles.
11
+ - Updated dependencies
12
+
3
13
  ## 3.15.0
4
14
 
5
15
  ### Minor Changes
package/dist/cjs/ui/issue-like-table/render-type/date-time/index.js CHANGED
@@ -8,11 +8,10 @@ exports.default = exports.DATETIME_TYPE_TEST_ID = void 0;
8
8
  exports.getFormattedDate = getFormattedDate;
9
9
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
10
  var _react = _interopRequireDefault(require("react"));
11
- var _styled = _interopRequireDefault(require("@emotion/styled"));
12
11
  var _reactIntlNext = require("react-intl-next");
13
- var _styled2 = require("../../styled");
12
+ var _compiled = require("@atlaskit/primitives/compiled");
14
13
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
15
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
14
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
16
15
  var DATETIME_TYPE_TEST_ID = exports.DATETIME_TYPE_TEST_ID = 'link-datasource-render-type--datetime';
17
16
  var dateOptions = {
18
17
  month: 'short',
@@ -24,12 +23,6 @@ var timeOptions = {
24
23
  hour: '2-digit',
25
24
  minute: '2-digit'
26
25
  };
27
-
28
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
29
- var DateTimeWrapper = _styled.default.span({
30
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
31
- fontSize: _styled2.fieldTextFontSize
32
- });
33
26
  function getFormattedDate(value) {
34
27
  var display = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'datetime';
35
28
  var formatDate = arguments.length > 2 ? arguments[2] : undefined;
@@ -61,8 +54,8 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
61
54
  if (formattedString === '') {
62
55
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
63
56
  }
64
- return /*#__PURE__*/_react.default.createElement(DateTimeWrapper, {
65
- "data-testid": testId
57
+ return /*#__PURE__*/_react.default.createElement(_compiled.Text, {
58
+ testId: testId
66
59
  }, formattedString);
67
60
  };
68
61
  var _default = exports.default = DateTimeRenderType;
package/dist/cjs/ui/issue-like-table/render-type/link/index.js CHANGED
@@ -12,17 +12,16 @@ var _smartCard = require("@atlaskit/smart-card");
12
12
  var _hoverCard = require("@atlaskit/smart-card/hover-card");
13
13
  var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
14
14
  var _colors = require("@atlaskit/theme/colors");
15
- var _typography = require("@atlaskit/theme/typography");
16
- var _styled = require("../../styled");
17
15
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
18
16
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
19
17
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
20
18
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
21
19
  var linkStyles = {
22
- key: _objectSpread(_objectSpread({}, (0, _typography.h300)()), {}, {
20
+ key: {
21
+ fontWeight: "var(--ds-font-weight-semibold, 600)",
23
22
  color: "var(--ds-text-subtlest, ".concat(_colors.N300, ")"),
24
- fontWeight: 600
25
- }),
23
+ marginTop: "var(--ds-space-250, 20px)"
24
+ },
26
25
  default: {}
27
26
  };
28
27
  var LINK_TYPE_TEST_ID = exports.LINK_TYPE_TEST_ID = 'link-datasource-render-type--link';
@@ -40,11 +39,11 @@ var LinkRenderType = function LinkRenderType(_ref) {
40
39
  url: url
41
40
  }, /*#__PURE__*/_react.default.createElement(_linkUrl.default, {
42
41
  href: url
42
+ // NOTE: This will no longer apply styles to `@atlaskit/link` when platform_editor_hyperlink_underline is enabled.
43
+ // Wrap `@atlaskit/link` in a Text component to provide font styles to Link
43
44
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
44
45
  ,
45
- style: _objectSpread(_objectSpread({}, linkStyle), {}, {
46
- fontSize: _styled.fieldTextFontSize
47
- }),
46
+ style: _objectSpread({}, linkStyle),
48
47
  "data-testid": testId,
49
48
  target: "_blank"
50
49
  }, text || url));
package/dist/cjs/ui/issue-like-table/render-type/text/index.js CHANGED
@@ -6,17 +6,8 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = exports.TEXT_TYPE_TEST_ID = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
- var _styled = _interopRequireDefault(require("@emotion/styled"));
10
- var _styled2 = require("../../styled");
11
- // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
12
-
9
+ var _primitives = require("@atlaskit/primitives");
13
10
  var TEXT_TYPE_TEST_ID = exports.TEXT_TYPE_TEST_ID = 'link-datasource-render-type--text';
14
-
15
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
16
- var TextWrapper = _styled.default.span({
17
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
18
- fontSize: _styled2.fieldTextFontSize
19
- });
20
11
  var TextRenderType = function TextRenderType(_ref) {
21
12
  var text = _ref.text,
22
13
  _ref$testId = _ref.testId,
@@ -24,8 +15,8 @@ var TextRenderType = function TextRenderType(_ref) {
24
15
  if (!(text && typeof text === 'string')) {
25
16
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
26
17
  }
27
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(TextWrapper, {
28
- "data-testid": testId
18
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_primitives.Text, {
19
+ testId: testId
29
20
  }, text), /*#__PURE__*/_react.default.createElement("br", null));
30
21
  };
31
22
  var _default = exports.default = TextRenderType;
package/dist/cjs/ui/issue-like-table/render-type/user/index.js CHANGED
@@ -16,7 +16,6 @@ var _avatarGroup = _interopRequireDefault(require("@atlaskit/avatar-group"));
16
16
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
17
  var _primitives = require("@atlaskit/primitives");
18
18
  var _widthDetector = require("@atlaskit/width-detector");
19
- var _styled2 = require("../../styled");
20
19
  var _messages = require("./messages");
21
20
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
22
21
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -32,8 +31,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
32
31
  var userWrapperStyles = (0, _primitives.xcss)({
33
32
  display: 'flex',
34
33
  alignItems: 'center',
35
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
36
- fontSize: "".concat(_styled2.fieldTextFontSize, "px")
34
+ font: 'font.body'
37
35
  });
38
36
  var avatarWrapperStyles = (0, _primitives.xcss)({
39
37
  marginRight: 'space.100'
package/dist/cjs/ui/issue-like-table/styled.js CHANGED
@@ -4,14 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.withTablePluginPrefix = exports.withTablePluginHeaderPrefix = exports.withTablePluginBodyPrefix = exports.fieldTextFontSize = exports.TableHeading = exports.TableCell = exports.Table = exports.ScrollableContainerHeight = exports.InlineEditableTableCell = void 0;
7
+ exports.withTablePluginPrefix = exports.withTablePluginHeaderPrefix = exports.withTablePluginBodyPrefix = exports.TableHeading = exports.TableCell = exports.Table = exports.ScrollableContainerHeight = exports.InlineEditableTableCell = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _styled = _interopRequireDefault(require("@emotion/styled"));
10
10
  var _colors = require("@atlaskit/theme/colors");
11
- var _typography = require("@atlaskit/theme/typography");
12
11
  var _styled$th, _styled$td, _styled$td2; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
13
12
  var ScrollableContainerHeight = exports.ScrollableContainerHeight = 590;
14
- var fieldTextFontSize = exports.fieldTextFontSize = "var(--ds-font-body, ".concat(_typography.fontFallback.body.medium, ")");
15
13
 
16
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
17
15
  var Table = exports.Table = _styled.default.table({
@@ -76,8 +74,7 @@ var TableHeading = exports.TableHeading = _styled.default.th((_styled$th = {}, (
76
74
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
77
75
  var TableCell = exports.TableCell = _styled.default.td((_styled$td = {}, (0, _defineProperty2.default)(_styled$td, "".concat(withTablePluginBodyPrefix()), {
78
76
  /* First section here is to override things editor table plugin css defines */
79
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
80
- font: fieldTextFontSize,
77
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
81
78
  padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-100, 8px)"),
82
79
  border: 0,
83
80
  minWidth: 'auto',
@@ -100,8 +97,7 @@ var TableCell = exports.TableCell = _styled.default.td((_styled$td = {}, (0, _de
100
97
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- To migrate as part of go/ui-styling-standard
101
98
  var InlineEditableTableCell = exports.InlineEditableTableCell = _styled.default.td((_styled$td2 = {}, (0, _defineProperty2.default)(_styled$td2, "".concat(withTablePluginBodyPrefix()), {
102
99
  /* First section here is to override things editor table plugin css defines */
103
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
104
- font: fieldTextFontSize,
100
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
105
101
  padding: "var(--ds-space-0, 0)".concat(" ", "var(--ds-space-0, 0)"),
106
102
  border: 0,
107
103
  minWidth: 'auto',
package/dist/es2019/ui/issue-like-table/render-type/date-time/index.js CHANGED
@@ -1,9 +1,6 @@
1
1
  import React from 'react';
2
-
3
- // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
4
- import styled from '@emotion/styled';
5
2
  import { useIntl } from 'react-intl-next';
6
- import { fieldTextFontSize } from '../../styled';
3
+ import { Text } from '@atlaskit/primitives/compiled';
7
4
  export const DATETIME_TYPE_TEST_ID = 'link-datasource-render-type--datetime';
8
5
  const dateOptions = {
9
6
  month: 'short',
@@ -15,12 +12,6 @@ const timeOptions = {
15
12
  hour: '2-digit',
16
13
  minute: '2-digit'
17
14
  };
18
-
19
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
20
- const DateTimeWrapper = styled.span({
21
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
22
- fontSize: fieldTextFontSize
23
- });
24
15
  export function getFormattedDate(value, display = 'datetime', formatDate) {
25
16
  /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
26
17
  to be one day off in some timezones. We want it to display the date without converting timezones and a solution
@@ -52,8 +43,8 @@ const DateTimeRenderType = ({
52
43
  if (formattedString === '') {
53
44
  return /*#__PURE__*/React.createElement(React.Fragment, null);
54
45
  }
55
- return /*#__PURE__*/React.createElement(DateTimeWrapper, {
56
- "data-testid": testId
46
+ return /*#__PURE__*/React.createElement(Text, {
47
+ testId: testId
57
48
  }, formattedString);
58
49
  };
59
50
  export default DateTimeRenderType;
package/dist/es2019/ui/issue-like-table/render-type/link/index.js CHANGED
@@ -3,13 +3,11 @@ import { Card } from '@atlaskit/smart-card';
3
3
  import { HoverCard } from '@atlaskit/smart-card/hover-card';
4
4
  import LinkUrl from '@atlaskit/smart-card/link-url';
5
5
  import { N300 } from '@atlaskit/theme/colors';
6
- import { h300 } from '@atlaskit/theme/typography';
7
- import { fieldTextFontSize } from '../../styled';
8
6
  const linkStyles = {
9
7
  key: {
10
- ...h300(),
8
+ fontWeight: "var(--ds-font-weight-semibold, 600)",
11
9
  color: `var(--ds-text-subtlest, ${N300})`,
12
- fontWeight: 600
10
+ marginTop: "var(--ds-space-250, 20px)"
13
11
  },
14
12
  default: {}
15
13
  };
@@ -27,11 +25,12 @@ const LinkRenderType = ({
27
25
  url: url
28
26
  }, /*#__PURE__*/React.createElement(LinkUrl, {
29
27
  href: url
28
+ // NOTE: This will no longer apply styles to `@atlaskit/link` when platform_editor_hyperlink_underline is enabled.
29
+ // Wrap `@atlaskit/link` in a Text component to provide font styles to Link
30
30
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
31
31
  ,
32
32
  style: {
33
- ...linkStyle,
34
- fontSize: fieldTextFontSize
33
+ ...linkStyle
35
34
  },
36
35
  "data-testid": testId,
37
36
  target: "_blank"
package/dist/es2019/ui/issue-like-table/render-type/text/index.js CHANGED
@@ -1,15 +1,6 @@
1
1
  import React from 'react';
2
-
3
- // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
4
- import styled from '@emotion/styled';
5
- import { fieldTextFontSize } from '../../styled';
2
+ import { Text } from '@atlaskit/primitives';
6
3
  export const TEXT_TYPE_TEST_ID = 'link-datasource-render-type--text';
7
-
8
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
9
- const TextWrapper = styled.span({
10
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
11
- fontSize: fieldTextFontSize
12
- });
13
4
  const TextRenderType = ({
14
5
  text,
15
6
  testId = TEXT_TYPE_TEST_ID
@@ -17,8 +8,8 @@ const TextRenderType = ({
17
8
  if (!(text && typeof text === 'string')) {
18
9
  return /*#__PURE__*/React.createElement(React.Fragment, null);
19
10
  }
20
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TextWrapper, {
21
- "data-testid": testId
11
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
12
+ testId: testId
22
13
  }, text), /*#__PURE__*/React.createElement("br", null));
23
14
  };
24
15
  export default TextRenderType;
package/dist/es2019/ui/issue-like-table/render-type/user/index.js CHANGED
@@ -14,13 +14,11 @@ import AvatarGroup from '@atlaskit/avatar-group';
14
14
  import { fg } from '@atlaskit/platform-feature-flags';
15
15
  import { Box, xcss } from '@atlaskit/primitives';
16
16
  import { WidthObserver } from '@atlaskit/width-detector';
17
- import { fieldTextFontSize } from '../../styled';
18
17
  import { userTypeMessages } from './messages';
19
18
  const userWrapperStyles = xcss({
20
19
  display: 'flex',
21
20
  alignItems: 'center',
22
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
23
- fontSize: `${fieldTextFontSize}px`
21
+ font: 'font.body'
24
22
  });
25
23
  const avatarWrapperStyles = xcss({
26
24
  marginRight: 'space.100'
package/dist/es2019/ui/issue-like-table/styled.js CHANGED
@@ -1,9 +1,7 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import styled from '@emotion/styled';
3
3
  import { N40 } from '@atlaskit/theme/colors';
4
- import { fontFallback } from '@atlaskit/theme/typography';
5
4
  export const ScrollableContainerHeight = 590;
6
- export const fieldTextFontSize = `var(--ds-font-body, ${fontFallback.body.medium})`;
7
5
 
8
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
9
7
  export const Table = styled.table({
@@ -82,8 +80,7 @@ export const TableCell = styled.td({
82
80
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
83
81
  [`${withTablePluginBodyPrefix()}`]: {
84
82
  /* First section here is to override things editor table plugin css defines */
85
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
86
- font: fieldTextFontSize,
83
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
87
84
  padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"}`,
88
85
  border: 0,
89
86
  minWidth: 'auto',
@@ -117,8 +114,7 @@ export const InlineEditableTableCell = styled.td({
117
114
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
118
115
  [`${withTablePluginBodyPrefix()}`]: {
119
116
  /* First section here is to override things editor table plugin css defines */
120
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
121
- font: fieldTextFontSize,
117
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
122
118
  padding: `${"var(--ds-space-0, 0)"} ${"var(--ds-space-0, 0)"}`,
123
119
  border: 0,
124
120
  minWidth: 'auto',
package/dist/esm/ui/issue-like-table/render-type/date-time/index.js CHANGED
@@ -2,11 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
3
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import React from 'react';
5
-
6
- // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
7
- import styled from '@emotion/styled';
8
5
  import { useIntl } from 'react-intl-next';
9
- import { fieldTextFontSize } from '../../styled';
6
+ import { Text } from '@atlaskit/primitives/compiled';
10
7
  export var DATETIME_TYPE_TEST_ID = 'link-datasource-render-type--datetime';
11
8
  var dateOptions = {
12
9
  month: 'short',
@@ -18,12 +15,6 @@ var timeOptions = {
18
15
  hour: '2-digit',
19
16
  minute: '2-digit'
20
17
  };
21
-
22
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
23
- var DateTimeWrapper = styled.span({
24
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
25
- fontSize: fieldTextFontSize
26
- });
27
18
  export function getFormattedDate(value) {
28
19
  var display = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'datetime';
29
20
  var formatDate = arguments.length > 2 ? arguments[2] : undefined;
@@ -55,8 +46,8 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
55
46
  if (formattedString === '') {
56
47
  return /*#__PURE__*/React.createElement(React.Fragment, null);
57
48
  }
58
- return /*#__PURE__*/React.createElement(DateTimeWrapper, {
59
- "data-testid": testId
49
+ return /*#__PURE__*/React.createElement(Text, {
50
+ testId: testId
60
51
  }, formattedString);
61
52
  };
62
53
  export default DateTimeRenderType;
package/dist/esm/ui/issue-like-table/render-type/link/index.js CHANGED
@@ -6,13 +6,12 @@ import { Card } from '@atlaskit/smart-card';
6
6
  import { HoverCard } from '@atlaskit/smart-card/hover-card';
7
7
  import LinkUrl from '@atlaskit/smart-card/link-url';
8
8
  import { N300 } from '@atlaskit/theme/colors';
9
- import { h300 } from '@atlaskit/theme/typography';
10
- import { fieldTextFontSize } from '../../styled';
11
9
  var linkStyles = {
12
- key: _objectSpread(_objectSpread({}, h300()), {}, {
10
+ key: {
11
+ fontWeight: "var(--ds-font-weight-semibold, 600)",
13
12
  color: "var(--ds-text-subtlest, ".concat(N300, ")"),
14
- fontWeight: 600
15
- }),
13
+ marginTop: "var(--ds-space-250, 20px)"
14
+ },
16
15
  default: {}
17
16
  };
18
17
  export var LINK_TYPE_TEST_ID = 'link-datasource-render-type--link';
@@ -30,11 +29,11 @@ var LinkRenderType = function LinkRenderType(_ref) {
30
29
  url: url
31
30
  }, /*#__PURE__*/React.createElement(LinkUrl, {
32
31
  href: url
32
+ // NOTE: This will no longer apply styles to `@atlaskit/link` when platform_editor_hyperlink_underline is enabled.
33
+ // Wrap `@atlaskit/link` in a Text component to provide font styles to Link
33
34
  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
34
35
  ,
35
- style: _objectSpread(_objectSpread({}, linkStyle), {}, {
36
- fontSize: fieldTextFontSize
37
- }),
36
+ style: _objectSpread({}, linkStyle),
38
37
  "data-testid": testId,
39
38
  target: "_blank"
40
39
  }, text || url));
package/dist/esm/ui/issue-like-table/render-type/text/index.js CHANGED
@@ -1,15 +1,6 @@
1
1
  import React from 'react';
2
-
3
- // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
4
- import styled from '@emotion/styled';
5
- import { fieldTextFontSize } from '../../styled';
2
+ import { Text } from '@atlaskit/primitives';
6
3
  export var TEXT_TYPE_TEST_ID = 'link-datasource-render-type--text';
7
-
8
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
9
- var TextWrapper = styled.span({
10
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
11
- fontSize: fieldTextFontSize
12
- });
13
4
  var TextRenderType = function TextRenderType(_ref) {
14
5
  var text = _ref.text,
15
6
  _ref$testId = _ref.testId,
@@ -17,8 +8,8 @@ var TextRenderType = function TextRenderType(_ref) {
17
8
  if (!(text && typeof text === 'string')) {
18
9
  return /*#__PURE__*/React.createElement(React.Fragment, null);
19
10
  }
20
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TextWrapper, {
21
- "data-testid": testId
11
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
12
+ testId: testId
22
13
  }, text), /*#__PURE__*/React.createElement("br", null));
23
14
  };
24
15
  export default TextRenderType;
package/dist/esm/ui/issue-like-table/render-type/user/index.js CHANGED
@@ -15,13 +15,11 @@ import AvatarGroup from '@atlaskit/avatar-group';
15
15
  import { fg } from '@atlaskit/platform-feature-flags';
16
16
  import { Box, xcss } from '@atlaskit/primitives';
17
17
  import { WidthObserver } from '@atlaskit/width-detector';
18
- import { fieldTextFontSize } from '../../styled';
19
18
  import { userTypeMessages } from './messages';
20
19
  var userWrapperStyles = xcss({
21
20
  display: 'flex',
22
21
  alignItems: 'center',
23
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
24
- fontSize: "".concat(fieldTextFontSize, "px")
22
+ font: 'font.body'
25
23
  });
26
24
  var avatarWrapperStyles = xcss({
27
25
  marginRight: 'space.100'
package/dist/esm/ui/issue-like-table/styled.js CHANGED
@@ -3,9 +3,7 @@ var _styled$th, _styled$td, _styled$td2;
3
3
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
4
4
  import styled from '@emotion/styled';
5
5
  import { N40 } from '@atlaskit/theme/colors';
6
- import { fontFallback } from '@atlaskit/theme/typography';
7
6
  export var ScrollableContainerHeight = 590;
8
- export var fieldTextFontSize = "var(--ds-font-body, ".concat(fontFallback.body.medium, ")");
9
7
 
10
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
11
9
  export var Table = styled.table({
@@ -70,8 +68,7 @@ export var TableHeading = styled.th((_styled$th = {}, _defineProperty(_styled$th
70
68
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
71
69
  export var TableCell = styled.td((_styled$td = {}, _defineProperty(_styled$td, "".concat(withTablePluginBodyPrefix()), {
72
70
  /* First section here is to override things editor table plugin css defines */
73
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
74
- font: fieldTextFontSize,
71
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
75
72
  padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-100, 8px)"),
76
73
  border: 0,
77
74
  minWidth: 'auto',
@@ -94,8 +91,7 @@ export var TableCell = styled.td((_styled$td = {}, _defineProperty(_styled$td, "
94
91
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- To migrate as part of go/ui-styling-standard
95
92
  export var InlineEditableTableCell = styled.td((_styled$td2 = {}, _defineProperty(_styled$td2, "".concat(withTablePluginBodyPrefix()), {
96
93
  /* First section here is to override things editor table plugin css defines */
97
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
98
- font: fieldTextFontSize,
94
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
99
95
  padding: "var(--ds-space-0, 0)".concat(" ", "var(--ds-space-0, 0)"),
100
96
  border: 0,
101
97
  minWidth: 'auto',
package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import React from 'react';
2
2
  import type { PopupComponentProps } from '@atlaskit/popup';
3
- export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "id" | "children" | "style" | "appearance" | "data-testid" | "tabIndex" | "role" | "xcss" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
3
+ export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "id" | "children" | "style" | "xcss" | "data-testid" | "role" | "appearance" | "tabIndex" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
package/dist/types/ui/issue-like-table/styled.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  /// <reference types="react" />
2
2
  export declare const ScrollableContainerHeight = 590;
3
- export declare const fieldTextFontSize: "var(--ds-font-body)";
4
3
  export declare const Table: import("@emotion/styled").StyledComponent<{
5
4
  theme?: import("@emotion/react").Theme | undefined;
6
5
  as?: import("react").ElementType<any> | undefined;
package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import React from 'react';
2
2
  import type { PopupComponentProps } from '@atlaskit/popup';
3
- export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "id" | "children" | "style" | "appearance" | "data-testid" | "tabIndex" | "role" | "xcss" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
3
+ export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "id" | "children" | "style" | "xcss" | "data-testid" | "role" | "appearance" | "tabIndex" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
package/dist/types-ts4.5/ui/issue-like-table/styled.d.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  /// <reference types="react" />
2
2
  export declare const ScrollableContainerHeight = 590;
3
- export declare const fieldTextFontSize: "var(--ds-font-body)";
4
3
  export declare const Table: import("@emotion/styled").StyledComponent<{
5
4
  theme?: import("@emotion/react").Theme | undefined;
6
5
  as?: import("react").ElementType<any> | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/link-datasource",
3
- "version": "3.15.0",
3
+ "version": "3.15.1",
4
4
  "description": "UI Components to support linking platform dataset feature",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -80,7 +80,7 @@
80
80
  "@atlaskit/textfield": "6.7.0",
81
81
  "@atlaskit/theme": "^14.0.0",
82
82
  "@atlaskit/tokens": "^2.4.0",
83
- "@atlaskit/tooltip": "^18.9.0",
83
+ "@atlaskit/tooltip": "^19.0.0",
84
84
  "@atlaskit/ufo": "^0.3.0",
85
85
  "@atlaskit/width-detector": "^4.3.0",
86
86
  "@babel/runtime": "^7.0.0",