@atlaskit/editor-plugin-help-dialog 6.0.8 → 6.0.10

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 (14) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/cjs/ui/ModalContent.js +3 -1
  3. package/dist/cjs/ui/formatting.js +29 -27
  4. package/dist/cjs/ui/index.js +4 -0
  5. package/dist/cjs/ui/utils.js +4 -2
  6. package/dist/es2019/ui/ModalContent.js +3 -1
  7. package/dist/es2019/ui/formatting.js +170 -166
  8. package/dist/es2019/ui/index.js +4 -0
  9. package/dist/es2019/ui/utils.js +3 -1
  10. package/dist/esm/ui/ModalContent.js +3 -1
  11. package/dist/esm/ui/formatting.js +3 -1
  12. package/dist/esm/ui/index.js +4 -0
  13. package/dist/esm/ui/utils.js +3 -1
  14. package/package.json +6 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-plugin-help-dialog
2
2
 
3
+ ## 6.0.10
4
+
5
+ ### Patch Changes
6
+
7
+ - [`6a8ea33d35037`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6a8ea33d35037) -
8
+ upgrade use of browser util
9
+ - Updated dependencies
10
+
11
+ ## 6.0.9
12
+
13
+ ### Patch Changes
14
+
15
+ - [`fc830b2ec8cad`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fc830b2ec8cad) -
16
+ ENGHEALTH-32569: ensure editor help modal has an accessible title
17
+ - Updated dependencies
18
+
3
19
  ## 6.0.8
4
20
 
5
21
  ### Patch Changes
package/dist/cjs/ui/ModalContent.js CHANGED
@@ -13,6 +13,7 @@ var _messages = require("@atlaskit/editor-common/messages");
13
13
  var _heading = _interopRequireDefault(require("@atlaskit/heading"));
14
14
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
15
  var _compiled = require("@atlaskit/primitives/compiled");
16
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
16
17
  var _ModalFooter = _interopRequireDefault(require("./ModalFooter"));
17
18
  var _ModalHeader = _interopRequireDefault(require("./ModalHeader"));
18
19
  var _styles = require("./styles");
@@ -28,6 +29,7 @@ var _utils = require("./utils");
28
29
  var ModalContent = exports.ModalContent = function ModalContent(_ref) {
29
30
  var formatting = _ref.formatting,
30
31
  onClose = _ref.onClose;
32
+ var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
31
33
  return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_ModalHeader.default, {
32
34
  onClose: onClose
33
35
  }), (0, _react2.jsx)("div", {
@@ -46,7 +48,7 @@ var ModalContent = exports.ModalContent = function ModalContent(_ref) {
46
48
  // eslint-disable-next-line react/jsx-props-no-spreading
47
49
  , _messages.helpDialogMessages.keyboardShortcuts)), (0, _react2.jsx)("ul", null, formatting.filter(function (form) {
48
50
  var keymap = form.keymap && form.keymap();
49
- return keymap && keymap[_browser.browser.mac ? 'mac' : 'windows'];
51
+ return keymap && keymap[browser.mac ? 'mac' : 'windows'];
50
52
  }).map(function (form) {
51
53
  // Ignored via go/ees005
52
54
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
package/dist/cjs/ui/formatting.js CHANGED
@@ -13,6 +13,7 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
13
13
  var _messages = require("@atlaskit/editor-common/messages");
14
14
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
15
  var _primitives = require("@atlaskit/primitives");
16
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
16
17
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
17
18
  var _styles = require("./styles");
18
19
  /**
@@ -397,6 +398,7 @@ var quickInsertAskAI = function quickInsertAskAI(_ref3) {
397
398
  };
398
399
  var otherFormatting = function otherFormatting(_ref4) {
399
400
  var formatMessage = _ref4.formatMessage;
401
+ var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
400
402
  return [{
401
403
  name: formatMessage(_messages.toolbarMessages.clearFormatting),
402
404
  type: 'clearFormatting',
@@ -443,11 +445,11 @@ var otherFormatting = function otherFormatting(_ref4) {
443
445
  css: _styles.shortcutsArray
444
446
  }, (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
445
447
  as: "span",
446
- xcss: _browser.browser.mac ? codeSm : codeMd
447
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
448
+ xcss: browser.mac ? codeSm : codeMd
449
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
448
450
  as: "span",
449
451
  xcss: codeMd
450
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
452
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
451
453
  as: "span",
452
454
  xcss: codeMd
453
455
  }, "Shift"), ' + ', (0, _react.jsx)(_primitives.Box, {
@@ -455,11 +457,11 @@ var otherFormatting = function otherFormatting(_ref4) {
455
457
  xcss: codeSm
456
458
  }, "\u2190")), (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
457
459
  as: "span",
458
- xcss: _browser.browser.mac ? codeSm : codeMd
459
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
460
+ xcss: browser.mac ? codeSm : codeMd
461
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
460
462
  as: "span",
461
463
  xcss: codeMd
462
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
464
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
463
465
  as: "span",
464
466
  xcss: codeMd
465
467
  }, "Shift"), ' + ', (0, _react.jsx)(_primitives.Box, {
@@ -478,11 +480,11 @@ var otherFormatting = function otherFormatting(_ref4) {
478
480
  css: _styles.shortcutsArray
479
481
  }, (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
480
482
  as: "span",
481
- xcss: _browser.browser.mac ? codeSm : codeMd
482
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
483
+ xcss: browser.mac ? codeSm : codeMd
484
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
483
485
  as: "span",
484
486
  xcss: codeMd
485
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
487
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
486
488
  as: "span",
487
489
  xcss: codeMd
488
490
  }, "Shift"), ' + ', (0, _react.jsx)(_primitives.Box, {
@@ -490,11 +492,11 @@ var otherFormatting = function otherFormatting(_ref4) {
490
492
  xcss: codeSm
491
493
  }, "\u2191")), (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
492
494
  as: "span",
493
- xcss: _browser.browser.mac ? codeSm : codeMd
494
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
495
+ xcss: browser.mac ? codeSm : codeMd
496
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
495
497
  as: "span",
496
498
  xcss: codeMd
497
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
499
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
498
500
  as: "span",
499
501
  xcss: codeMd
500
502
  }, "Shift"), ' + ', (0, _react.jsx)(_primitives.Box, {
@@ -513,20 +515,20 @@ var otherFormatting = function otherFormatting(_ref4) {
513
515
  css: _styles.shortcutsArray
514
516
  }, (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
515
517
  as: "span",
516
- xcss: _browser.browser.mac ? codeSm : codeMd
517
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
518
+ xcss: browser.mac ? codeSm : codeMd
519
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
518
520
  as: "span",
519
521
  xcss: codeMd
520
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
522
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
521
523
  as: "span",
522
524
  xcss: codeSm
523
525
  }, "=")), (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
524
526
  as: "span",
525
- xcss: _browser.browser.mac ? codeSm : codeMd
526
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
527
+ xcss: browser.mac ? codeSm : codeMd
528
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
527
529
  as: "span",
528
530
  xcss: codeMd
529
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
531
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
530
532
  as: "span",
531
533
  xcss: codeSm
532
534
  }, "-")))
@@ -542,20 +544,20 @@ var otherFormatting = function otherFormatting(_ref4) {
542
544
  css: _styles.shortcutsArray
543
545
  }, (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
544
546
  as: "span",
545
- xcss: _browser.browser.mac ? codeSm : codeMd
546
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
547
+ xcss: browser.mac ? codeSm : codeMd
548
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
547
549
  as: "span",
548
550
  xcss: codeMd
549
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
551
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
550
552
  as: "span",
551
553
  xcss: codeSm
552
554
  }, "]")), (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
553
555
  as: "span",
554
- xcss: _browser.browser.mac ? codeSm : codeMd
555
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
556
+ xcss: browser.mac ? codeSm : codeMd
557
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
556
558
  as: "span",
557
559
  xcss: codeMd
558
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
560
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
559
561
  as: "span",
560
562
  xcss: codeSm
561
563
  }, "[")))
@@ -571,11 +573,11 @@ var otherFormatting = function otherFormatting(_ref4) {
571
573
  css: _styles.shortcutsArray
572
574
  }, (0, _react.jsx)("span", null, (0, _react.jsx)(_primitives.Box, {
573
575
  as: "span",
574
- xcss: _browser.browser.mac ? codeSm : codeMd
575
- }, _browser.browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
576
+ xcss: browser.mac ? codeSm : codeMd
577
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', (0, _react.jsx)(_primitives.Box, {
576
578
  as: "span",
577
579
  xcss: codeMd
578
- }, _browser.browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
580
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', (0, _react.jsx)(_primitives.Box, {
579
581
  as: "span",
580
582
  xcss: codeMd
581
583
  }, "Shift"), ' + ', (0, _react.jsx)(_primitives.Box, {
package/dist/cjs/ui/index.js CHANGED
@@ -10,7 +10,9 @@ var _react = require("react");
10
10
  var _react2 = require("@emotion/react");
11
11
  var _reactIntlNext = require("react-intl-next");
12
12
  var _hooks = require("@atlaskit/editor-common/hooks");
13
+ var _messages = require("@atlaskit/editor-common/messages");
13
14
  var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
15
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
14
16
  var _commands = require("../pm-plugins/commands");
15
17
  var _formatting = require("./formatting");
16
18
  var _Modal = _interopRequireDefault(require("./Modal"));
@@ -60,7 +62,9 @@ var HelpDialog = function HelpDialog(_ref) {
60
62
  };
61
63
  }, [handleEsc]);
62
64
  var formatting = (0, _formatting.getSupportedFormatting)(editorView.state.schema, intl, imageEnabled, quickInsertEnabled, aiEnabled);
65
+ var label = (0, _platformFeatureFlags.fg)('platform_editor_fix_help_modal_header') ? intl.formatMessage(_messages.helpDialogMessages.editorHelp) : undefined;
63
66
  return (0, _react2.jsx)(_modalDialog.ModalTransition, null, isVisible ? (0, _react2.jsx)(_modalDialog.default, {
67
+ label: label,
64
68
  width: "large",
65
69
  onClose: closeDialog,
66
70
  testId: "help-modal-dialog"
package/dist/cjs/ui/utils.js CHANGED
@@ -7,6 +7,7 @@ exports.shortcutNamesWithoutKeymap = exports.getComponentFromKeymap = void 0;
7
7
  var _react = require("@emotion/react");
8
8
  var _browser = require("@atlaskit/editor-common/browser");
9
9
  var _primitives = require("@atlaskit/primitives");
10
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
10
11
  var _styles = require("./styles");
11
12
  /**
12
13
  * @jsxRuntime classic
@@ -44,8 +45,9 @@ var codeSm = (0, _primitives.xcss)({
44
45
  textAlign: 'center'
45
46
  });
46
47
  var getKeyParts = function getKeyParts(keymap) {
47
- var shortcut = keymap[_browser.browser.mac ? 'mac' : 'windows'];
48
- if (_browser.browser.mac) {
48
+ var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
49
+ var shortcut = keymap[browser.mac ? 'mac' : 'windows'];
50
+ if (browser.mac) {
49
51
  shortcut = shortcut.replace('Alt', 'Opt');
50
52
  }
51
53
  // Ignored via go/ees005
package/dist/es2019/ui/ModalContent.js CHANGED
@@ -8,11 +8,12 @@ import React from 'react';
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
9
9
  import { jsx } from '@emotion/react';
10
10
  import { FormattedMessage } from 'react-intl-next';
11
- import { browser } from '@atlaskit/editor-common/browser';
11
+ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
12
12
  import { helpDialogMessages as messages } from '@atlaskit/editor-common/messages';
13
13
  import Heading from '@atlaskit/heading';
14
14
  import { fg } from '@atlaskit/platform-feature-flags';
15
15
  import { Text } from '@atlaskit/primitives/compiled';
16
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
16
17
  import ModalFooter from './ModalFooter';
17
18
  import ModalHeader from './ModalHeader';
18
19
  import { column, content, contentWrapper, line, row } from './styles';
@@ -21,6 +22,7 @@ export const ModalContent = ({
21
22
  formatting,
22
23
  onClose
23
24
  }) => {
25
+ const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
24
26
  return jsx(React.Fragment, null, jsx(ModalHeader, {
25
27
  onClose: onClose
26
28
  }), jsx("div", {
package/dist/es2019/ui/formatting.js CHANGED
@@ -5,12 +5,13 @@
5
5
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
6
6
  import { jsx } from '@emotion/react';
7
7
  import { FormattedMessage } from 'react-intl-next';
8
- import { browser } from '@atlaskit/editor-common/browser';
8
+ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
9
9
  import { addInlineComment, addLink, alignCenter, alignLeft, alignRight, askAIQuickInsert, clearFormatting, decreaseMediaSize, focusTableResizer, focusToContextMenuTrigger, increaseMediaSize, insertRule, navToEditorToolbar, navToFloatingToolbar, pastePlainText, redo, redoAlt, setNormalText, toggleBlockQuote, toggleBold, toggleBulletList, toggleCode, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleHighlightPalette, toggleItalic, toggleOrderedList, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleTaskItemCheckbox, toggleUnderline, undo } from '@atlaskit/editor-common/keymaps';
10
10
  import { alignmentMessages, annotationMessages, blockTypeMessages, listMessages, helpDialogMessages as messages, toolbarInsertBlockMessages, toolbarMessages, undoRedoMessages } from '@atlaskit/editor-common/messages';
11
11
  import { fg } from '@atlaskit/platform-feature-flags';
12
12
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
13
13
  import { Box, xcss } from '@atlaskit/primitives';
14
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
14
15
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
15
16
  import { shortcutsArray } from './styles';
16
17
  const codeSm = xcss({
@@ -294,171 +295,174 @@ const quickInsertAskAI = ({
294
295
  });
295
296
  const otherFormatting = ({
296
297
  formatMessage
297
- }) => [{
298
- name: formatMessage(toolbarMessages.clearFormatting),
299
- type: 'clearFormatting',
300
- keymap: () => clearFormatting
301
- }, {
302
- name: formatMessage(undoRedoMessages.undo),
303
- type: 'undo',
304
- keymap: () => undo
305
- }, {
306
- name: formatMessage(undoRedoMessages.redo),
307
- type: 'redo',
308
- keymap: () => fg('platform_editor_cmd_y_mac_redo_shortcut') ? redoAlt : redo
309
- }, {
310
- name: formatMessage(messages.pastePlainText),
311
- type: 'paste',
312
- keymap: () => pastePlainText
313
- }, {
314
- name: formatMessage(annotationMessages.createComment),
315
- type: 'annotation',
316
- keymap: () => addInlineComment
317
- }, {
318
- name: formatMessage(messages.CheckUncheckActionItem),
319
- type: 'checkbox',
320
- keymap: () => toggleTaskItemCheckbox
321
- }, {
322
- name: formatMessage(messages.selectTableRow),
323
- type: 'table',
324
- autoFormatting: () =>
325
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
326
- jsx("span", {
327
- css: shortcutsArray
328
- }, jsx("span", null, jsx(Box, {
329
- as: "span",
330
- xcss: browser.mac ? codeSm : codeMd
331
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
332
- as: "span",
333
- xcss: codeMd
334
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
335
- as: "span",
336
- xcss: codeMd
337
- }, "Shift"), ' + ', jsx(Box, {
338
- as: "span",
339
- xcss: codeSm
340
- }, "\u2190")), jsx("span", null, jsx(Box, {
341
- as: "span",
342
- xcss: browser.mac ? codeSm : codeMd
343
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
344
- as: "span",
345
- xcss: codeMd
346
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
347
- as: "span",
348
- xcss: codeMd
349
- }, "Shift"), ' + ', jsx(Box, {
350
- as: "span",
351
- xcss: codeSm
352
- }, "\u2192")))
353
- }, {
354
- name: formatMessage(messages.selectTableColumn),
355
- type: 'table',
356
- autoFormatting: () =>
357
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
358
- jsx("span", {
359
- css: shortcutsArray
360
- }, jsx("span", null, jsx(Box, {
361
- as: "span",
362
- xcss: browser.mac ? codeSm : codeMd
363
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
364
- as: "span",
365
- xcss: codeMd
366
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
367
- as: "span",
368
- xcss: codeMd
369
- }, "Shift"), ' + ', jsx(Box, {
370
- as: "span",
371
- xcss: codeSm
372
- }, "\u2191")), jsx("span", null, jsx(Box, {
373
- as: "span",
374
- xcss: browser.mac ? codeSm : codeMd
375
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
376
- as: "span",
377
- xcss: codeMd
378
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
379
- as: "span",
380
- xcss: codeMd
381
- }, "Shift"), ' + ', jsx(Box, {
382
- as: "span",
383
- xcss: codeSm
384
- }, "\u2193")))
385
- }, ...[{
386
- name: formatMessage(messages.InsertTableColumn),
387
- type: 'table',
388
- autoFormatting: () =>
389
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
390
- jsx("span", {
391
- css: shortcutsArray
392
- }, jsx("span", null, jsx(Box, {
393
- as: "span",
394
- xcss: browser.mac ? codeSm : codeMd
395
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
396
- as: "span",
397
- xcss: codeMd
398
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
399
- as: "span",
400
- xcss: codeSm
401
- }, "=")), jsx("span", null, jsx(Box, {
402
- as: "span",
403
- xcss: browser.mac ? codeSm : codeMd
404
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
405
- as: "span",
406
- xcss: codeMd
407
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
408
- as: "span",
409
- xcss: codeSm
410
- }, "-")))
411
- }, {
412
- name: formatMessage(messages.InsertTableRow),
413
- type: 'table',
414
- autoFormatting: () =>
415
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
416
- jsx("span", {
417
- css: shortcutsArray
418
- }, jsx("span", null, jsx(Box, {
419
- as: "span",
420
- xcss: browser.mac ? codeSm : codeMd
421
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
422
- as: "span",
423
- xcss: codeMd
424
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
425
- as: "span",
426
- xcss: codeSm
427
- }, "]")), jsx("span", null, jsx(Box, {
428
- as: "span",
429
- xcss: browser.mac ? codeSm : codeMd
430
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
431
- as: "span",
432
- xcss: codeMd
433
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
434
- as: "span",
435
- xcss: codeSm
436
- }, "[")))
437
- }], ...[{
438
- name: formatMessage(messages.selectColumnResize),
439
- type: 'table',
440
- autoFormatting: () =>
441
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
442
- jsx("span", {
443
- css: shortcutsArray
444
- }, jsx("span", null, jsx(Box, {
445
- as: "span",
446
- xcss: browser.mac ? codeSm : codeMd
447
- }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
448
- as: "span",
449
- xcss: codeMd
450
- }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
451
- as: "span",
452
- xcss: codeMd
453
- }, "Shift"), ' + ', jsx(Box, {
454
- as: "span",
455
- xcss: codeSm
456
- }, "C")))
457
- }], {
458
- name: formatMessage(messages.highlightColor),
459
- type: 'highlight',
460
- keymap: () => toggleHighlightPalette
461
- }];
298
+ }) => {
299
+ const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
300
+ return [{
301
+ name: formatMessage(toolbarMessages.clearFormatting),
302
+ type: 'clearFormatting',
303
+ keymap: () => clearFormatting
304
+ }, {
305
+ name: formatMessage(undoRedoMessages.undo),
306
+ type: 'undo',
307
+ keymap: () => undo
308
+ }, {
309
+ name: formatMessage(undoRedoMessages.redo),
310
+ type: 'redo',
311
+ keymap: () => fg('platform_editor_cmd_y_mac_redo_shortcut') ? redoAlt : redo
312
+ }, {
313
+ name: formatMessage(messages.pastePlainText),
314
+ type: 'paste',
315
+ keymap: () => pastePlainText
316
+ }, {
317
+ name: formatMessage(annotationMessages.createComment),
318
+ type: 'annotation',
319
+ keymap: () => addInlineComment
320
+ }, {
321
+ name: formatMessage(messages.CheckUncheckActionItem),
322
+ type: 'checkbox',
323
+ keymap: () => toggleTaskItemCheckbox
324
+ }, {
325
+ name: formatMessage(messages.selectTableRow),
326
+ type: 'table',
327
+ autoFormatting: () =>
328
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
329
+ jsx("span", {
330
+ css: shortcutsArray
331
+ }, jsx("span", null, jsx(Box, {
332
+ as: "span",
333
+ xcss: browser.mac ? codeSm : codeMd
334
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
335
+ as: "span",
336
+ xcss: codeMd
337
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
338
+ as: "span",
339
+ xcss: codeMd
340
+ }, "Shift"), ' + ', jsx(Box, {
341
+ as: "span",
342
+ xcss: codeSm
343
+ }, "\u2190")), jsx("span", null, jsx(Box, {
344
+ as: "span",
345
+ xcss: browser.mac ? codeSm : codeMd
346
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
347
+ as: "span",
348
+ xcss: codeMd
349
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
350
+ as: "span",
351
+ xcss: codeMd
352
+ }, "Shift"), ' + ', jsx(Box, {
353
+ as: "span",
354
+ xcss: codeSm
355
+ }, "\u2192")))
356
+ }, {
357
+ name: formatMessage(messages.selectTableColumn),
358
+ type: 'table',
359
+ autoFormatting: () =>
360
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
361
+ jsx("span", {
362
+ css: shortcutsArray
363
+ }, jsx("span", null, jsx(Box, {
364
+ as: "span",
365
+ xcss: browser.mac ? codeSm : codeMd
366
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
367
+ as: "span",
368
+ xcss: codeMd
369
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
370
+ as: "span",
371
+ xcss: codeMd
372
+ }, "Shift"), ' + ', jsx(Box, {
373
+ as: "span",
374
+ xcss: codeSm
375
+ }, "\u2191")), jsx("span", null, jsx(Box, {
376
+ as: "span",
377
+ xcss: browser.mac ? codeSm : codeMd
378
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
379
+ as: "span",
380
+ xcss: codeMd
381
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
382
+ as: "span",
383
+ xcss: codeMd
384
+ }, "Shift"), ' + ', jsx(Box, {
385
+ as: "span",
386
+ xcss: codeSm
387
+ }, "\u2193")))
388
+ }, ...[{
389
+ name: formatMessage(messages.InsertTableColumn),
390
+ type: 'table',
391
+ autoFormatting: () =>
392
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
393
+ jsx("span", {
394
+ css: shortcutsArray
395
+ }, jsx("span", null, jsx(Box, {
396
+ as: "span",
397
+ xcss: browser.mac ? codeSm : codeMd
398
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
399
+ as: "span",
400
+ xcss: codeMd
401
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
402
+ as: "span",
403
+ xcss: codeSm
404
+ }, "=")), jsx("span", null, jsx(Box, {
405
+ as: "span",
406
+ xcss: browser.mac ? codeSm : codeMd
407
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
408
+ as: "span",
409
+ xcss: codeMd
410
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
411
+ as: "span",
412
+ xcss: codeSm
413
+ }, "-")))
414
+ }, {
415
+ name: formatMessage(messages.InsertTableRow),
416
+ type: 'table',
417
+ autoFormatting: () =>
418
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
419
+ jsx("span", {
420
+ css: shortcutsArray
421
+ }, jsx("span", null, jsx(Box, {
422
+ as: "span",
423
+ xcss: browser.mac ? codeSm : codeMd
424
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
425
+ as: "span",
426
+ xcss: codeMd
427
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
428
+ as: "span",
429
+ xcss: codeSm
430
+ }, "]")), jsx("span", null, jsx(Box, {
431
+ as: "span",
432
+ xcss: browser.mac ? codeSm : codeMd
433
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
434
+ as: "span",
435
+ xcss: codeMd
436
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
437
+ as: "span",
438
+ xcss: codeSm
439
+ }, "[")))
440
+ }], ...[{
441
+ name: formatMessage(messages.selectColumnResize),
442
+ type: 'table',
443
+ autoFormatting: () =>
444
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
445
+ jsx("span", {
446
+ css: shortcutsArray
447
+ }, jsx("span", null, jsx(Box, {
448
+ as: "span",
449
+ xcss: browser.mac ? codeSm : codeMd
450
+ }, browser.mac ? '⌘' : 'Ctrl'), ' + ', jsx(Box, {
451
+ as: "span",
452
+ xcss: codeMd
453
+ }, browser.mac ? 'Opt' : 'Alt'), ' + ', jsx(Box, {
454
+ as: "span",
455
+ xcss: codeMd
456
+ }, "Shift"), ' + ', jsx(Box, {
457
+ as: "span",
458
+ xcss: codeSm
459
+ }, "C")))
460
+ }], {
461
+ name: formatMessage(messages.highlightColor),
462
+ type: 'highlight',
463
+ keymap: () => toggleHighlightPalette
464
+ }];
465
+ };
462
466
  const resizeInformationFormatting = ({
463
467
  formatMessage
464
468
  }) => [{
package/dist/es2019/ui/index.js CHANGED
@@ -8,7 +8,9 @@ import { useCallback, useEffect } from 'react';
8
8
  import { jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
11
+ import { helpDialogMessages as messages } from '@atlaskit/editor-common/messages';
11
12
  import AkModalDialog, { ModalTransition } from '@atlaskit/modal-dialog';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
12
14
  import { closeHelpCommand } from '../pm-plugins/commands';
13
15
  import { getSupportedFormatting } from './formatting';
14
16
  import Modal from './Modal';
@@ -56,7 +58,9 @@ const HelpDialog = ({
56
58
  };
57
59
  }, [handleEsc]);
58
60
  const formatting = getSupportedFormatting(editorView.state.schema, intl, imageEnabled, quickInsertEnabled, aiEnabled);
61
+ const label = fg('platform_editor_fix_help_modal_header') ? intl.formatMessage(messages.editorHelp) : undefined;
59
62
  return jsx(ModalTransition, null, isVisible ? jsx(AkModalDialog, {
63
+ label: label,
60
64
  width: "large",
61
65
  onClose: closeDialog,
62
66
  testId: "help-modal-dialog"
package/dist/es2019/ui/utils.js CHANGED
@@ -4,9 +4,10 @@
4
4
  */
5
5
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
6
6
  import { jsx } from '@emotion/react';
7
- import { browser } from '@atlaskit/editor-common/browser';
7
+ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
8
8
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
9
9
  import { Box, xcss } from '@atlaskit/primitives';
10
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
11
  import { componentFromKeymapWrapperStyles } from './styles';
11
12
  const codeLg = xcss({
12
13
  borderRadius: 'radius.small',
@@ -36,6 +37,7 @@ const codeSm = xcss({
36
37
  textAlign: 'center'
37
38
  });
38
39
  const getKeyParts = keymap => {
40
+ const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
39
41
  let shortcut = keymap[browser.mac ? 'mac' : 'windows'];
40
42
  if (browser.mac) {
41
43
  shortcut = shortcut.replace('Alt', 'Opt');
package/dist/esm/ui/ModalContent.js CHANGED
@@ -8,11 +8,12 @@ import React from 'react';
8
8
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
9
9
  import { jsx } from '@emotion/react';
10
10
  import { FormattedMessage } from 'react-intl-next';
11
- import { browser } from '@atlaskit/editor-common/browser';
11
+ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
12
12
  import { helpDialogMessages as messages } from '@atlaskit/editor-common/messages';
13
13
  import Heading from '@atlaskit/heading';
14
14
  import { fg } from '@atlaskit/platform-feature-flags';
15
15
  import { Text } from '@atlaskit/primitives/compiled';
16
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
16
17
  import ModalFooter from './ModalFooter';
17
18
  import ModalHeader from './ModalHeader';
18
19
  import { column, content, contentWrapper, line, row } from './styles';
@@ -20,6 +21,7 @@ import { getComponentFromKeymap, shortcutNamesWithoutKeymap } from './utils';
20
21
  export var ModalContent = function ModalContent(_ref) {
21
22
  var formatting = _ref.formatting,
22
23
  onClose = _ref.onClose;
24
+ var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
23
25
  return jsx(React.Fragment, null, jsx(ModalHeader, {
24
26
  onClose: onClose
25
27
  }), jsx("div", {
package/dist/esm/ui/formatting.js CHANGED
@@ -6,12 +6,13 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
6
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
7
7
  import { jsx } from '@emotion/react';
8
8
  import { FormattedMessage } from 'react-intl-next';
9
- import { browser } from '@atlaskit/editor-common/browser';
9
+ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
10
10
  import { addInlineComment, addLink, alignCenter, alignLeft, alignRight, askAIQuickInsert, clearFormatting, decreaseMediaSize, focusTableResizer, focusToContextMenuTrigger, increaseMediaSize, insertRule, navToEditorToolbar, navToFloatingToolbar, pastePlainText, redo, redoAlt, setNormalText, toggleBlockQuote, toggleBold, toggleBulletList, toggleCode, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleHighlightPalette, toggleItalic, toggleOrderedList, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleTaskItemCheckbox, toggleUnderline, undo } from '@atlaskit/editor-common/keymaps';
11
11
  import { alignmentMessages, annotationMessages, blockTypeMessages, listMessages, helpDialogMessages as messages, toolbarInsertBlockMessages, toolbarMessages, undoRedoMessages } from '@atlaskit/editor-common/messages';
12
12
  import { fg } from '@atlaskit/platform-feature-flags';
13
13
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
14
14
  import { Box, xcss } from '@atlaskit/primitives';
15
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
15
16
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
16
17
  import { shortcutsArray } from './styles';
17
18
  var codeSm = xcss({
@@ -388,6 +389,7 @@ var quickInsertAskAI = function quickInsertAskAI(_ref3) {
388
389
  };
389
390
  var otherFormatting = function otherFormatting(_ref4) {
390
391
  var formatMessage = _ref4.formatMessage;
392
+ var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
391
393
  return [{
392
394
  name: formatMessage(toolbarMessages.clearFormatting),
393
395
  type: 'clearFormatting',
package/dist/esm/ui/index.js CHANGED
@@ -8,7 +8,9 @@ import { useCallback, useEffect } from 'react';
8
8
  import { jsx } from '@emotion/react';
9
9
  import { injectIntl } from 'react-intl-next';
10
10
  import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
11
+ import { helpDialogMessages as messages } from '@atlaskit/editor-common/messages';
11
12
  import AkModalDialog, { ModalTransition } from '@atlaskit/modal-dialog';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
12
14
  import { closeHelpCommand } from '../pm-plugins/commands';
13
15
  import { getSupportedFormatting } from './formatting';
14
16
  import Modal from './Modal';
@@ -50,7 +52,9 @@ var HelpDialog = function HelpDialog(_ref) {
50
52
  };
51
53
  }, [handleEsc]);
52
54
  var formatting = getSupportedFormatting(editorView.state.schema, intl, imageEnabled, quickInsertEnabled, aiEnabled);
55
+ var label = fg('platform_editor_fix_help_modal_header') ? intl.formatMessage(messages.editorHelp) : undefined;
53
56
  return jsx(ModalTransition, null, isVisible ? jsx(AkModalDialog, {
57
+ label: label,
54
58
  width: "large",
55
59
  onClose: closeDialog,
56
60
  testId: "help-modal-dialog"
package/dist/esm/ui/utils.js CHANGED
@@ -4,9 +4,10 @@
4
4
  */
5
5
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
6
6
  import { jsx } from '@emotion/react';
7
- import { browser } from '@atlaskit/editor-common/browser';
7
+ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
8
8
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
9
9
  import { Box, xcss } from '@atlaskit/primitives';
10
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
10
11
  import { componentFromKeymapWrapperStyles } from './styles';
11
12
  var codeLg = xcss({
12
13
  borderRadius: 'radius.small',
@@ -36,6 +37,7 @@ var codeSm = xcss({
36
37
  textAlign: 'center'
37
38
  });
38
39
  var getKeyParts = function getKeyParts(keymap) {
40
+ var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
39
41
  var shortcut = keymap[browser.mac ? 'mac' : 'windows'];
40
42
  if (browser.mac) {
41
43
  shortcut = shortcut.replace('Alt', 'Opt');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-help-dialog",
3
- "version": "6.0.8",
3
+ "version": "6.0.10",
4
4
  "description": "Help Dialog plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,7 +32,7 @@
32
32
  "@atlaskit/editor-plugin-analytics": "^6.2.0",
33
33
  "@atlaskit/editor-plugin-quick-insert": "^6.0.0",
34
34
  "@atlaskit/editor-prosemirror": "7.0.0",
35
- "@atlaskit/editor-shared-styles": "^3.7.0",
35
+ "@atlaskit/editor-shared-styles": "^3.8.0",
36
36
  "@atlaskit/heading": "^5.2.0",
37
37
  "@atlaskit/icon": "^28.5.0",
38
38
  "@atlaskit/modal-dialog": "^14.5.0",
@@ -41,7 +41,7 @@
41
41
  "@atlaskit/theme": "^21.0.0",
42
42
  "@atlaskit/tmp-editor-statsig": "^13.13.0",
43
43
  "@atlaskit/tokens": "^7.0.0",
44
- "@atlaskit/tooltip": "^20.5.0",
44
+ "@atlaskit/tooltip": "^20.6.0",
45
45
  "@babel/runtime": "^7.0.0",
46
46
  "@emotion/react": "^11.7.1",
47
47
  "react-intl-next": "npm:react-intl@^5.18.1",
@@ -99,6 +99,9 @@
99
99
  },
100
100
  "platform_editor_help_dialog_a11y": {
101
101
  "type": "boolean"
102
+ },
103
+ "platform_editor_fix_help_modal_header": {
104
+ "type": "boolean"
102
105
  }
103
106
  }
104
107
  }