@atlaskit/editor-plugin-help-dialog 1.5.2 → 1.7.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.
Files changed (13) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/cjs/ui/ModalContent.js +4 -13
  3. package/dist/cjs/ui/ModalHeader.js +1 -5
  4. package/dist/cjs/ui/styles.js +5 -25
  5. package/dist/es2019/ui/ModalContent.js +5 -14
  6. package/dist/es2019/ui/ModalHeader.js +2 -6
  7. package/dist/es2019/ui/styles.js +4 -24
  8. package/dist/esm/ui/ModalContent.js +5 -14
  9. package/dist/esm/ui/ModalHeader.js +2 -6
  10. package/dist/esm/ui/styles.js +4 -24
  11. package/dist/types/ui/styles.d.ts +0 -9
  12. package/dist/types-ts4.5/ui/styles.d.ts +0 -9
  13. package/package.json +8 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,29 @@
1
1
  # @atlaskit/editor-plugin-help-dialog
2
2
 
3
+ ## 1.7.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#130825](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130825)
8
+ [`d8a00de5637ff`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d8a00de5637ff) -
9
+ ENGHEALTH-9890: Bumps React peer dependency for Lego editor plugins
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 1.6.0
16
+
17
+ ### Minor Changes
18
+
19
+ - [#129411](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129411)
20
+ [`175fc1454a8a4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/175fc1454a8a4) -
21
+ [ux] Migrate typography with new ADS token and primitive and remove feature gate
22
+
23
+ ### Patch Changes
24
+
25
+ - Updated dependencies
26
+
3
27
  ## 1.5.2
4
28
 
5
29
  ### Patch Changes
package/dist/cjs/ui/ModalContent.js CHANGED
@@ -11,7 +11,6 @@ var _reactIntlNext = require("react-intl-next");
11
11
  var _messages = require("@atlaskit/editor-common/messages");
12
12
  var _utils = require("@atlaskit/editor-common/utils");
13
13
  var _heading = _interopRequireDefault(require("@atlaskit/heading"));
14
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
14
  var _primitives = require("@atlaskit/primitives");
16
15
  var _ModalFooter = _interopRequireDefault(require("./ModalFooter"));
17
16
  var _ModalHeader = _interopRequireDefault(require("./ModalHeader"));
@@ -38,12 +37,8 @@ var ModalContent = exports.ModalContent = function ModalContent(_ref) {
38
37
  css: _styles.content
39
38
  }, (0, _react2.jsx)("div", {
40
39
  css: _styles.column
41
- }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_heading.default, {
40
+ }, (0, _react2.jsx)(_heading.default, {
42
41
  size: "medium"
43
- }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.helpDialogMessages.keyboardShortcuts)) :
44
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
45
- (0, _react2.jsx)("h2", {
46
- css: _styles.title
47
42
  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.helpDialogMessages.keyboardShortcuts)), (0, _react2.jsx)("ul", null, formatting.filter(function (form) {
48
43
  var keymap = form.keymap && form.keymap();
49
44
  return keymap && keymap[_utils.browser.mac ? 'mac' : 'windows'];
@@ -53,7 +48,7 @@ var ModalContent = exports.ModalContent = function ModalContent(_ref) {
53
48
  (0, _react2.jsx)("li", {
54
49
  css: _styles.row,
55
50
  key: "textFormatting-".concat(form.name)
56
- }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_primitives.Text, null, form.name) : (0, _react2.jsx)("span", null, form.name), (0, _utils2.getComponentFromKeymap)(form.keymap()))
51
+ }, (0, _react2.jsx)(_primitives.Text, null, form.name), (0, _utils2.getComponentFromKeymap)(form.keymap()))
57
52
  );
58
53
  }), formatting.filter(function (form) {
59
54
  return _utils2.shortcutNamesWithoutKeymap.indexOf(form.type) !== -1;
@@ -65,18 +60,14 @@ var ModalContent = exports.ModalContent = function ModalContent(_ref) {
65
60
  (0, _react2.jsx)("li", {
66
61
  css: _styles.row,
67
62
  key: "autoFormatting-".concat(form.name)
68
- }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_primitives.Text, null, form.name) : (0, _react2.jsx)("span", null, form.name), form.autoFormatting())
63
+ }, (0, _react2.jsx)(_primitives.Text, null, form.name), form.autoFormatting())
69
64
  );
70
65
  }))), (0, _react2.jsx)("div", {
71
66
  css: _styles.line
72
67
  }), (0, _react2.jsx)("div", {
73
68
  css: _styles.column
74
- }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react2.jsx)(_heading.default, {
69
+ }, (0, _react2.jsx)(_heading.default, {
75
70
  size: "medium"
76
- }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.helpDialogMessages.markdown)) :
77
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
78
- (0, _react2.jsx)("h2", {
79
- css: _styles.title
80
71
  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.helpDialogMessages.markdown)), (0, _react2.jsx)("ul", null, formatting.filter(function (form) {
81
72
  return _utils2.shortcutNamesWithoutKeymap.indexOf(form.type) === -1;
82
73
  }).map(function (form) {
package/dist/cjs/ui/ModalHeader.js CHANGED
@@ -27,12 +27,8 @@ var ModalHeader = (0, _reactIntlNext.injectIntl)(function (_ref) {
27
27
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
28
28
  (0, _react.jsx)("div", {
29
29
  css: _styles.header
30
- }, (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? (0, _react.jsx)(_heading.default, {
30
+ }, (0, _react.jsx)(_heading.default, {
31
31
  size: "large"
32
- }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.helpDialogMessages.editorHelp)) :
33
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
34
- (0, _react.jsx)("h1", {
35
- css: _styles.dialogHeader
36
32
  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.helpDialogMessages.editorHelp)), (0, _react.jsx)("div", null, (0, _react.jsx)(_uiMenu.ToolbarButton
37
33
  // @ts-expect-error modal onClose handler requires second parameter of UIAnalyticsEvent, which we don't want to pass
38
34
  , {
package/dist/cjs/ui/styles.js CHANGED
@@ -4,24 +4,17 @@ var _typeof = require("@babel/runtime/helpers/typeof");
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.toolbarButton = exports.title = exports.shortcutsArray = exports.row = exports.line = exports.header = exports.footer = exports.dialogHeader = exports.contentWrapper = exports.content = exports.componentFromKeymapWrapperStyles = exports.column = exports.codeSm = exports.codeMd = exports.codeLg = void 0;
7
+ exports.toolbarButton = exports.shortcutsArray = exports.row = exports.line = exports.header = exports.footer = exports.dialogHeader = exports.contentWrapper = exports.content = exports.componentFromKeymapWrapperStyles = exports.column = exports.codeSm = exports.codeMd = exports.codeLg = void 0;
8
8
  var _react = require("@emotion/react");
9
9
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
10
  var _colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
12
11
  var colors = _colors;
13
12
  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); }
14
13
  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 && Object.prototype.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; }
15
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
16
15
 
17
- var headerFont = (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? {
18
- font: "var(--ds-font-heading-large, normal 500 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
19
- } : {
20
- fontSize: (0, _editorSharedStyles.relativeFontSizeToBase16)(24)
21
- };
22
-
23
16
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
24
- var header = exports.header = (0, _react.css)(headerFont, {
17
+ var header = exports.header = (0, _react.css)({
25
18
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
26
19
  zIndex: _editorSharedStyles.akEditorUnitZIndex,
27
20
  minHeight: "var(--ds-space-300, 24px)",
@@ -30,25 +23,21 @@ var header = exports.header = (0, _react.css)(headerFont, {
30
23
  justifyContent: 'space-between',
31
24
  alignItems: 'center',
32
25
  boxShadow: "'none'",
26
+ font: "var(--ds-font-heading-large, normal 500 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
33
27
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
34
28
  color: "var(--ds-text, ".concat(colors.N400, ")"),
35
29
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
36
30
  backgroundColor: "var(--ds-background-neutral-subtle, ".concat(colors.N0, ")"),
37
31
  borderRadius: "var(--ds-border-radius, 3px)"
38
32
  });
39
- var footerFont = (0, _platformFeatureFlags.fg)('platform_editor_migration_icon_and_typography') ? {
40
- font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
41
- } : {
42
- fontSize: (0, _editorSharedStyles.relativeFontSizeToBase16)(14),
43
- lineHeight: "var(--ds-space-250, 20px)"
44
- };
45
33
 
46
34
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
47
- var footer = exports.footer = (0, _react.css)(footerFont, {
35
+ var footer = exports.footer = (0, _react.css)({
48
36
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
49
37
  zIndex: _editorSharedStyles.akEditorUnitZIndex,
50
38
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
51
39
  color: "var(--ds-text-subtlest, ".concat(colors.N300, ")"),
40
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
52
41
  padding: "var(--ds-space-300, 24px)",
53
42
  textAlign: 'right',
54
43
  boxShadow: "'none'"
@@ -110,15 +99,6 @@ var dialogHeader = exports.dialogHeader = {
110
99
  lineHeight: 1.42857142857143
111
100
  }
112
101
  };
113
- var title = exports.title = {
114
- '&': {
115
- fontSize: (0, _editorSharedStyles.relativeFontSizeToBase16)(18),
116
- fontWeight: 400,
117
- color: "var(--ds-text-subtle, ".concat(_colors.N400, ")"),
118
- letterSpacing: 'normal',
119
- lineHeight: 1.42857142857143
120
- }
121
- };
122
102
 
123
103
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
124
104
  var codeSm = exports.codeSm = (0, _react.css)({
package/dist/es2019/ui/ModalContent.js CHANGED
@@ -11,11 +11,10 @@ import { FormattedMessage } from 'react-intl-next';
11
11
  import { helpDialogMessages as messages } from '@atlaskit/editor-common/messages';
12
12
  import { browser } from '@atlaskit/editor-common/utils';
13
13
  import Heading from '@atlaskit/heading';
14
- import { fg } from '@atlaskit/platform-feature-flags';
15
14
  import { Text } from '@atlaskit/primitives';
16
15
  import ModalFooter from './ModalFooter';
17
16
  import ModalHeader from './ModalHeader';
18
- import { column, content, contentWrapper, line, row, title } from './styles';
17
+ import { column, content, contentWrapper, line, row } from './styles';
19
18
  import { getComponentFromKeymap, shortcutNamesWithoutKeymap } from './utils';
20
19
  export const ModalContent = ({
21
20
  formatting,
@@ -31,12 +30,8 @@ export const ModalContent = ({
31
30
  css: content
32
31
  }, jsx("div", {
33
32
  css: column
34
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Heading, {
33
+ }, jsx(Heading, {
35
34
  size: "medium"
36
- }, jsx(FormattedMessage, messages.keyboardShortcuts)) :
37
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
38
- jsx("h2", {
39
- css: title
40
35
  }, jsx(FormattedMessage, messages.keyboardShortcuts)), jsx("ul", null, formatting.filter(form => {
41
36
  const keymap = form.keymap && form.keymap();
42
37
  return keymap && keymap[browser.mac ? 'mac' : 'windows'];
@@ -45,21 +40,17 @@ export const ModalContent = ({
45
40
  jsx("li", {
46
41
  css: row,
47
42
  key: `textFormatting-${form.name}`
48
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Text, null, form.name) : jsx("span", null, form.name), getComponentFromKeymap(form.keymap()))), formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) !== -1).filter(form => form.autoFormatting).map(form =>
43
+ }, jsx(Text, null, form.name), getComponentFromKeymap(form.keymap()))), formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) !== -1).filter(form => form.autoFormatting).map(form =>
49
44
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
50
45
  jsx("li", {
51
46
  css: row,
52
47
  key: `autoFormatting-${form.name}`
53
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Text, null, form.name) : jsx("span", null, form.name), form.autoFormatting())))), jsx("div", {
48
+ }, jsx(Text, null, form.name), form.autoFormatting())))), jsx("div", {
54
49
  css: line
55
50
  }), jsx("div", {
56
51
  css: column
57
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Heading, {
52
+ }, jsx(Heading, {
58
53
  size: "medium"
59
- }, jsx(FormattedMessage, messages.markdown)) :
60
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
61
- jsx("h2", {
62
- css: title
63
54
  }, jsx(FormattedMessage, messages.markdown)), jsx("ul", null, formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) === -1).map(form => form.autoFormatting &&
64
55
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
65
56
  jsx("li", {
package/dist/es2019/ui/ModalHeader.js CHANGED
@@ -11,7 +11,7 @@ import Heading from '@atlaskit/heading';
11
11
  import CloseIcon from '@atlaskit/icon/core/migration/close--cross';
12
12
  import CrossIcon from '@atlaskit/icon/glyph/cross';
13
13
  import { fg } from '@atlaskit/platform-feature-flags';
14
- import { dialogHeader, header, toolbarButton } from './styles';
14
+ import { header, toolbarButton } from './styles';
15
15
  const ModalHeader = injectIntl(({
16
16
  intl: {
17
17
  formatMessage
@@ -22,12 +22,8 @@ const ModalHeader = injectIntl(({
22
22
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
23
23
  jsx("div", {
24
24
  css: header
25
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Heading, {
25
+ }, jsx(Heading, {
26
26
  size: "large"
27
- }, jsx(FormattedMessage, messages.editorHelp)) :
28
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
29
- jsx("h1", {
30
- css: dialogHeader
31
27
  }, jsx(FormattedMessage, messages.editorHelp)), jsx("div", null, jsx(ToolbarButton
32
28
  // @ts-expect-error modal onClose handler requires second parameter of UIAnalyticsEvent, which we don't want to pass
33
29
  , {
package/dist/es2019/ui/styles.js CHANGED
@@ -1,17 +1,10 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import { css } from '@emotion/react';
3
3
  import { akEditorUnitZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
4
- import { fg } from '@atlaskit/platform-feature-flags';
5
4
  import * as colors from '@atlaskit/theme/colors';
6
5
  import { B300, N400 } from '@atlaskit/theme/colors';
7
- const headerFont = fg('platform_editor_migration_icon_and_typography') ? {
8
- font: "var(--ds-font-heading-large, normal 500 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
9
- } : {
10
- fontSize: relativeFontSizeToBase16(24)
11
- };
12
-
13
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
14
- export const header = css(headerFont, {
7
+ export const header = css({
15
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
16
9
  zIndex: akEditorUnitZIndex,
17
10
  minHeight: "var(--ds-space-300, 24px)",
@@ -20,25 +13,21 @@ export const header = css(headerFont, {
20
13
  justifyContent: 'space-between',
21
14
  alignItems: 'center',
22
15
  boxShadow: "'none'",
16
+ font: "var(--ds-font-heading-large, normal 500 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
23
17
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
24
18
  color: `var(--ds-text, ${colors.N400})`,
25
19
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
26
20
  backgroundColor: `var(--ds-background-neutral-subtle, ${colors.N0})`,
27
21
  borderRadius: "var(--ds-border-radius, 3px)"
28
22
  });
29
- const footerFont = fg('platform_editor_migration_icon_and_typography') ? {
30
- font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
31
- } : {
32
- fontSize: relativeFontSizeToBase16(14),
33
- lineHeight: "var(--ds-space-250, 20px)"
34
- };
35
23
 
36
24
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
37
- export const footer = css(footerFont, {
25
+ export const footer = css({
38
26
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
39
27
  zIndex: akEditorUnitZIndex,
40
28
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
41
29
  color: `var(--ds-text-subtlest, ${colors.N300})`,
30
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
42
31
  padding: "var(--ds-space-300, 24px)",
43
32
  textAlign: 'right',
44
33
  boxShadow: "'none'"
@@ -100,15 +89,6 @@ export const dialogHeader = {
100
89
  lineHeight: 1.42857142857143
101
90
  }
102
91
  };
103
- export const title = {
104
- '&': {
105
- fontSize: relativeFontSizeToBase16(18),
106
- fontWeight: 400,
107
- color: `var(--ds-text-subtle, ${N400})`,
108
- letterSpacing: 'normal',
109
- lineHeight: 1.42857142857143
110
- }
111
- };
112
92
 
113
93
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
114
94
  export const codeSm = css({
package/dist/esm/ui/ModalContent.js CHANGED
@@ -11,11 +11,10 @@ import { FormattedMessage } from 'react-intl-next';
11
11
  import { helpDialogMessages as messages } from '@atlaskit/editor-common/messages';
12
12
  import { browser } from '@atlaskit/editor-common/utils';
13
13
  import Heading from '@atlaskit/heading';
14
- import { fg } from '@atlaskit/platform-feature-flags';
15
14
  import { Text } from '@atlaskit/primitives';
16
15
  import ModalFooter from './ModalFooter';
17
16
  import ModalHeader from './ModalHeader';
18
- import { column, content, contentWrapper, line, row, title } from './styles';
17
+ import { column, content, contentWrapper, line, row } from './styles';
19
18
  import { getComponentFromKeymap, shortcutNamesWithoutKeymap } from './utils';
20
19
  export var ModalContent = function ModalContent(_ref) {
21
20
  var formatting = _ref.formatting,
@@ -30,12 +29,8 @@ export var ModalContent = function ModalContent(_ref) {
30
29
  css: content
31
30
  }, jsx("div", {
32
31
  css: column
33
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Heading, {
32
+ }, jsx(Heading, {
34
33
  size: "medium"
35
- }, jsx(FormattedMessage, messages.keyboardShortcuts)) :
36
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
37
- jsx("h2", {
38
- css: title
39
34
  }, jsx(FormattedMessage, messages.keyboardShortcuts)), jsx("ul", null, formatting.filter(function (form) {
40
35
  var keymap = form.keymap && form.keymap();
41
36
  return keymap && keymap[browser.mac ? 'mac' : 'windows'];
@@ -45,7 +40,7 @@ export var ModalContent = function ModalContent(_ref) {
45
40
  jsx("li", {
46
41
  css: row,
47
42
  key: "textFormatting-".concat(form.name)
48
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Text, null, form.name) : jsx("span", null, form.name), getComponentFromKeymap(form.keymap()))
43
+ }, jsx(Text, null, form.name), getComponentFromKeymap(form.keymap()))
49
44
  );
50
45
  }), formatting.filter(function (form) {
51
46
  return shortcutNamesWithoutKeymap.indexOf(form.type) !== -1;
@@ -57,18 +52,14 @@ export var ModalContent = function ModalContent(_ref) {
57
52
  jsx("li", {
58
53
  css: row,
59
54
  key: "autoFormatting-".concat(form.name)
60
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Text, null, form.name) : jsx("span", null, form.name), form.autoFormatting())
55
+ }, jsx(Text, null, form.name), form.autoFormatting())
61
56
  );
62
57
  }))), jsx("div", {
63
58
  css: line
64
59
  }), jsx("div", {
65
60
  css: column
66
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Heading, {
61
+ }, jsx(Heading, {
67
62
  size: "medium"
68
- }, jsx(FormattedMessage, messages.markdown)) :
69
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
70
- jsx("h2", {
71
- css: title
72
63
  }, jsx(FormattedMessage, messages.markdown)), jsx("ul", null, formatting.filter(function (form) {
73
64
  return shortcutNamesWithoutKeymap.indexOf(form.type) === -1;
74
65
  }).map(function (form) {
package/dist/esm/ui/ModalHeader.js CHANGED
@@ -11,7 +11,7 @@ import Heading from '@atlaskit/heading';
11
11
  import CloseIcon from '@atlaskit/icon/core/migration/close--cross';
12
12
  import CrossIcon from '@atlaskit/icon/glyph/cross';
13
13
  import { fg } from '@atlaskit/platform-feature-flags';
14
- import { dialogHeader, header, toolbarButton } from './styles';
14
+ import { header, toolbarButton } from './styles';
15
15
  var ModalHeader = injectIntl(function (_ref) {
16
16
  var formatMessage = _ref.intl.formatMessage,
17
17
  onClose = _ref.onClose;
@@ -19,12 +19,8 @@ var ModalHeader = injectIntl(function (_ref) {
19
19
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
20
20
  jsx("div", {
21
21
  css: header
22
- }, fg('platform_editor_migration_icon_and_typography') ? jsx(Heading, {
22
+ }, jsx(Heading, {
23
23
  size: "large"
24
- }, jsx(FormattedMessage, messages.editorHelp)) :
25
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
26
- jsx("h1", {
27
- css: dialogHeader
28
24
  }, jsx(FormattedMessage, messages.editorHelp)), jsx("div", null, jsx(ToolbarButton
29
25
  // @ts-expect-error modal onClose handler requires second parameter of UIAnalyticsEvent, which we don't want to pass
30
26
  , {
package/dist/esm/ui/styles.js CHANGED
@@ -1,17 +1,10 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import { css } from '@emotion/react';
3
3
  import { akEditorUnitZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
4
- import { fg } from '@atlaskit/platform-feature-flags';
5
4
  import * as colors from '@atlaskit/theme/colors';
6
5
  import { B300, N400 } from '@atlaskit/theme/colors';
7
- var headerFont = fg('platform_editor_migration_icon_and_typography') ? {
8
- font: "var(--ds-font-heading-large, normal 500 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
9
- } : {
10
- fontSize: relativeFontSizeToBase16(24)
11
- };
12
-
13
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
14
- export var header = css(headerFont, {
7
+ export var header = css({
15
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
16
9
  zIndex: akEditorUnitZIndex,
17
10
  minHeight: "var(--ds-space-300, 24px)",
@@ -20,25 +13,21 @@ export var header = css(headerFont, {
20
13
  justifyContent: 'space-between',
21
14
  alignItems: 'center',
22
15
  boxShadow: "'none'",
16
+ font: "var(--ds-font-heading-large, normal 500 24px/28px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
23
17
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
24
18
  color: "var(--ds-text, ".concat(colors.N400, ")"),
25
19
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
26
20
  backgroundColor: "var(--ds-background-neutral-subtle, ".concat(colors.N0, ")"),
27
21
  borderRadius: "var(--ds-border-radius, 3px)"
28
22
  });
29
- var footerFont = fg('platform_editor_migration_icon_and_typography') ? {
30
- font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
31
- } : {
32
- fontSize: relativeFontSizeToBase16(14),
33
- lineHeight: "var(--ds-space-250, 20px)"
34
- };
35
23
 
36
24
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
37
- export var footer = css(footerFont, {
25
+ export var footer = css({
38
26
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
39
27
  zIndex: akEditorUnitZIndex,
40
28
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
41
29
  color: "var(--ds-text-subtlest, ".concat(colors.N300, ")"),
30
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
42
31
  padding: "var(--ds-space-300, 24px)",
43
32
  textAlign: 'right',
44
33
  boxShadow: "'none'"
@@ -100,15 +89,6 @@ export var dialogHeader = {
100
89
  lineHeight: 1.42857142857143
101
90
  }
102
91
  };
103
- export var title = {
104
- '&': {
105
- fontSize: relativeFontSizeToBase16(18),
106
- fontWeight: 400,
107
- color: "var(--ds-text-subtle, ".concat(N400, ")"),
108
- letterSpacing: 'normal',
109
- lineHeight: 1.42857142857143
110
- }
111
- };
112
92
 
113
93
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
114
94
  export var codeSm = css({
package/dist/types/ui/styles.d.ts CHANGED
@@ -19,15 +19,6 @@ export declare const dialogHeader: {
19
19
  lineHeight: number;
20
20
  };
21
21
  };
22
- export declare const title: {
23
- '&': {
24
- fontSize: string;
25
- fontWeight: number;
26
- color: "var(--ds-text-subtle)";
27
- letterSpacing: string;
28
- lineHeight: number;
29
- };
30
- };
31
22
  export declare const codeSm: import("@emotion/react").SerializedStyles;
32
23
  export declare const codeMd: import("@emotion/react").SerializedStyles;
33
24
  export declare const codeLg: import("@emotion/react").SerializedStyles;
package/dist/types-ts4.5/ui/styles.d.ts CHANGED
@@ -19,15 +19,6 @@ export declare const dialogHeader: {
19
19
  lineHeight: number;
20
20
  };
21
21
  };
22
- export declare const title: {
23
- '&': {
24
- fontSize: string;
25
- fontWeight: number;
26
- color: "var(--ds-text-subtle)";
27
- letterSpacing: string;
28
- lineHeight: number;
29
- };
30
- };
31
22
  export declare const codeSm: import("@emotion/react").SerializedStyles;
32
23
  export declare const codeMd: import("@emotion/react").SerializedStyles;
33
24
  export declare const codeLg: import("@emotion/react").SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-help-dialog",
3
- "version": "1.5.2",
3
+ "version": "1.7.0",
4
4
  "description": "Help Dialog plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,18 +32,18 @@
32
32
  ".": "./src/index.ts"
33
33
  },
34
34
  "dependencies": {
35
- "@atlaskit/editor-common": "^87.6.0",
35
+ "@atlaskit/editor-common": "^87.12.0",
36
36
  "@atlaskit/editor-plugin-analytics": "^1.7.0",
37
- "@atlaskit/editor-plugin-quick-insert": "^1.2.0",
37
+ "@atlaskit/editor-plugin-quick-insert": "^1.3.0",
38
38
  "@atlaskit/editor-prosemirror": "5.0.1",
39
39
  "@atlaskit/editor-shared-styles": "^2.13.0",
40
40
  "@atlaskit/heading": "^2.4.0",
41
- "@atlaskit/icon": "^22.11.0",
42
- "@atlaskit/modal-dialog": "^12.14.0",
41
+ "@atlaskit/icon": "^22.13.0",
42
+ "@atlaskit/modal-dialog": "^12.15.0",
43
43
  "@atlaskit/platform-feature-flags": "^0.3.0",
44
44
  "@atlaskit/primitives": "^12.0.0",
45
- "@atlaskit/theme": "^12.11.0",
46
- "@atlaskit/tokens": "^1.57.0",
45
+ "@atlaskit/theme": "^13.0.0",
46
+ "@atlaskit/tokens": "^1.58.0",
47
47
  "@babel/runtime": "^7.0.0",
48
48
  "@emotion/react": "^11.7.1",
49
49
  "react-intl-next": "npm:react-intl@^5.18.1",
@@ -53,7 +53,7 @@
53
53
  "@testing-library/react": "^12.1.5"
54
54
  },
55
55
  "peerDependencies": {
56
- "react": "^16.8.0"
56
+ "react": "^16.8.0 || ^17.0.0 || ~18.2.0"
57
57
  },
58
58
  "techstack": {
59
59
  "@atlassian/frontend": {