@atlaskit/editor-plugin-help-dialog 2.0.7 → 2.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/editor-plugin-help-dialog
2
2
 
3
+ ## 2.0.8
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
3
9
  ## 2.0.7
4
10
 
5
11
  ### Patch Changes
@@ -11,6 +11,7 @@ var _reactIntlNext = require("react-intl-next");
11
11
  var _browser = require("@atlaskit/editor-common/browser");
12
12
  var _keymaps = require("@atlaskit/editor-common/keymaps");
13
13
  var _messages = require("@atlaskit/editor-common/messages");
14
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
14
15
  var _primitives = require("@atlaskit/primitives");
15
16
  var _styles = require("./styles");
16
17
  /**
@@ -399,7 +400,7 @@ var otherFormatting = function otherFormatting(_ref3) {
399
400
  name: formatMessage(_messages.undoRedoMessages.redo),
400
401
  type: 'redo',
401
402
  keymap: function keymap() {
402
- return _keymaps.redo;
403
+ return (0, _platformFeatureFlags.fg)('platform_editor_cmd_y_mac_redo_shortcut') ? _keymaps.redoAlt : _keymaps.redo;
403
404
  }
404
405
  }, {
405
406
  name: formatMessage(_messages.helpDialogMessages.pastePlainText),
@@ -6,8 +6,9 @@
6
6
  import { jsx } from '@emotion/react';
7
7
  import { FormattedMessage } from 'react-intl-next';
8
8
  import { browser } from '@atlaskit/editor-common/browser';
9
- import { addInlineComment, addLink, alignCenter, alignLeft, alignRight, clearFormatting, decreaseMediaSize, focusTableResizer, focusToContextMenuTrigger, increaseMediaSize, insertRule, navToEditorToolbar, navToFloatingToolbar, pastePlainText, redo, 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';
9
+ import { addInlineComment, addLink, alignCenter, alignLeft, alignRight, 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
+ import { fg } from '@atlaskit/platform-feature-flags';
11
12
  import { Box, xcss } from '@atlaskit/primitives';
12
13
  import { shortcutsArray } from './styles';
13
14
  const codeSm = xcss({
@@ -295,7 +296,7 @@ const otherFormatting = ({
295
296
  }, {
296
297
  name: formatMessage(undoRedoMessages.redo),
297
298
  type: 'redo',
298
- keymap: () => redo
299
+ keymap: () => fg('platform_editor_cmd_y_mac_redo_shortcut') ? redoAlt : redo
299
300
  }, {
300
301
  name: formatMessage(messages.pastePlainText),
301
302
  type: 'paste',
@@ -7,8 +7,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
7
7
  import { jsx } from '@emotion/react';
8
8
  import { FormattedMessage } from 'react-intl-next';
9
9
  import { browser } from '@atlaskit/editor-common/browser';
10
- import { addInlineComment, addLink, alignCenter, alignLeft, alignRight, clearFormatting, decreaseMediaSize, focusTableResizer, focusToContextMenuTrigger, increaseMediaSize, insertRule, navToEditorToolbar, navToFloatingToolbar, pastePlainText, redo, 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
+ import { addInlineComment, addLink, alignCenter, alignLeft, alignRight, 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
+ import { fg } from '@atlaskit/platform-feature-flags';
12
13
  import { Box, xcss } from '@atlaskit/primitives';
13
14
  import { shortcutsArray } from './styles';
14
15
  var codeSm = xcss({
@@ -391,7 +392,7 @@ var otherFormatting = function otherFormatting(_ref3) {
391
392
  name: formatMessage(undoRedoMessages.redo),
392
393
  type: 'redo',
393
394
  keymap: function keymap() {
394
- return redo;
395
+ return fg('platform_editor_cmd_y_mac_redo_shortcut') ? redoAlt : redo;
395
396
  }
396
397
  }, {
397
398
  name: formatMessage(messages.pastePlainText),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-help-dialog",
3
- "version": "2.0.7",
3
+ "version": "2.0.8",
4
4
  "description": "Help Dialog plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -33,17 +33,18 @@
33
33
  ".": "./src/index.ts"
34
34
  },
35
35
  "dependencies": {
36
- "@atlaskit/editor-common": "^102.13.0",
36
+ "@atlaskit/editor-common": "^103.0.0",
37
37
  "@atlaskit/editor-plugin-analytics": "^2.2.0",
38
38
  "@atlaskit/editor-plugin-quick-insert": "^2.2.0",
39
39
  "@atlaskit/editor-prosemirror": "7.0.0",
40
40
  "@atlaskit/editor-shared-styles": "^3.4.0",
41
41
  "@atlaskit/heading": "^5.1.0",
42
- "@atlaskit/icon": "^25.0.0",
43
- "@atlaskit/modal-dialog": "^14.0.0",
44
- "@atlaskit/primitives": "^14.2.0",
42
+ "@atlaskit/icon": "^25.5.0",
43
+ "@atlaskit/modal-dialog": "^14.1.0",
44
+ "@atlaskit/platform-feature-flags": "^1.1.0",
45
+ "@atlaskit/primitives": "^14.3.0",
45
46
  "@atlaskit/theme": "^18.0.0",
46
- "@atlaskit/tokens": "^4.5.0",
47
+ "@atlaskit/tokens": "^4.7.0",
47
48
  "@babel/runtime": "^7.0.0",
48
49
  "@emotion/react": "^11.7.1",
49
50
  "react-intl-next": "npm:react-intl@^5.18.1",
@@ -87,5 +88,10 @@
87
88
  "emotion"
88
89
  ]
89
90
  }
91
+ },
92
+ "platform-feature-flags": {
93
+ "platform_editor_cmd_y_mac_redo_shortcut": {
94
+ "type": "boolean"
95
+ }
90
96
  }
91
97
  }