@atlaskit/editor-plugin-list 7.2.1 → 7.2.3

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 (11) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/cjs/ui/BulletedListBlockMenuItem.js +8 -1
  3. package/dist/cjs/ui/NumberedListBlockMenuItem.js +8 -1
  4. package/dist/cjs/ui/index.js +3 -2
  5. package/dist/es2019/ui/BulletedListBlockMenuItem.js +8 -1
  6. package/dist/es2019/ui/NumberedListBlockMenuItem.js +8 -1
  7. package/dist/es2019/ui/index.js +4 -3
  8. package/dist/esm/ui/BulletedListBlockMenuItem.js +8 -1
  9. package/dist/esm/ui/NumberedListBlockMenuItem.js +8 -1
  10. package/dist/esm/ui/index.js +4 -3
  11. package/package.json +8 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-plugin-list
2
2
 
3
+ ## 7.2.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [`b878645133984`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b878645133984) -
8
+ [ux] Adds revised ranks to use in Turn into menu. It will group the headings together at the top
9
+ of the menu.
10
+ - Updated dependencies
11
+
12
+ ## 7.2.2
13
+
14
+ ### Patch Changes
15
+
16
+ - [`b610a8281f843`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b610a8281f843) -
17
+ Fix double format options highlight for selection with blockQuotes
18
+ - Updated dependencies
19
+
3
20
  ## 7.2.1
4
21
 
5
22
  ### Patch Changes
package/dist/cjs/ui/BulletedListBlockMenuItem.js CHANGED
@@ -18,6 +18,13 @@ var BulletedListBlockMenuItem = function BulletedListBlockMenuItem(_ref) {
18
18
  var _useIntl = (0, _reactIntlNext.useIntl)(),
19
19
  formatMessage = _useIntl.formatMessage;
20
20
  var bulletListActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'list.bulletListActive');
21
+ var currentSelectedNodeName = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockMenu.currentSelectedNodeName');
22
+
23
+ // Check if a blockquote is currently selected
24
+ var isBlockquoteSelected = currentSelectedNodeName === null || currentSelectedNodeName === void 0 ? void 0 : currentSelectedNodeName.includes('blockquote');
25
+
26
+ // Only show as selected if bullet list is active AND we're not selecting a blockquote
27
+ var isSelected = bulletListActive && !isBlockquoteSelected;
21
28
  var handleClick = function handleClick() {
22
29
  if (!bulletListActive) {
23
30
  var _api$blockMenu;
@@ -26,7 +33,7 @@ var BulletedListBlockMenuItem = function BulletedListBlockMenuItem(_ref) {
26
33
  };
27
34
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
28
35
  onClick: handleClick,
29
- isSelected: bulletListActive,
36
+ isSelected: isSelected,
30
37
  elemBefore: /*#__PURE__*/_react.default.createElement(_listBulleted.default, {
31
38
  label: ""
32
39
  })
package/dist/cjs/ui/NumberedListBlockMenuItem.js CHANGED
@@ -16,6 +16,13 @@ var NumberedListBlockMenuItem = function NumberedListBlockMenuItem(_ref) {
16
16
  var _useIntl = (0, _reactIntlNext.useIntl)(),
17
17
  formatMessage = _useIntl.formatMessage;
18
18
  var orderedListActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'list.orderedListActive');
19
+ var currentSelectedNodeName = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockMenu.currentSelectedNodeName');
20
+
21
+ // Check if a blockquote is currently selected
22
+ var isBlockquoteSelected = currentSelectedNodeName === null || currentSelectedNodeName === void 0 ? void 0 : currentSelectedNodeName.includes('blockquote');
23
+
24
+ // Only show as selected if ordered list is active AND we're not selecting a blockquote
25
+ var isSelected = orderedListActive && !isBlockquoteSelected;
19
26
  var handleClick = function handleClick() {
20
27
  if (!orderedListActive) {
21
28
  var _api$blockMenu;
@@ -24,7 +31,7 @@ var NumberedListBlockMenuItem = function NumberedListBlockMenuItem(_ref) {
24
31
  };
25
32
  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
26
33
  onClick: handleClick,
27
- isSelected: orderedListActive,
34
+ isSelected: isSelected,
28
35
  elemBefore: /*#__PURE__*/_react.default.createElement(_listNumbered.default, {
29
36
  label: ""
30
37
  })
package/dist/cjs/ui/index.js CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.getListComponents = void 0;
7
7
  var _blockMenu = require("@atlaskit/editor-common/block-menu");
8
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
8
9
  var _BulletedListBlockMenuItem = require("./BulletedListBlockMenuItem");
9
10
  var _NumberedListBlockMenuItem = require("./NumberedListBlockMenuItem");
10
11
  var getListComponents = exports.getListComponents = function getListComponents(api) {
@@ -14,7 +15,7 @@ var getListComponents = exports.getListComponents = function getListComponents(a
14
15
  parent: {
15
16
  type: 'block-menu-section',
16
17
  key: 'nested-menu-format-section-primary',
17
- rank: _blockMenu.FORMAT_NESTED_MENU_RANK[_blockMenu.FORMAT_BULLETED_LIST_MENU_ITEM.key]
18
+ rank: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_format_rank_revised') ? _blockMenu.FORMAT_NESTED_MENU_RANK_REVISED[_blockMenu.FORMAT_BULLETED_LIST_MENU_ITEM.key] : _blockMenu.FORMAT_NESTED_MENU_RANK[_blockMenu.FORMAT_BULLETED_LIST_MENU_ITEM.key]
18
19
  },
19
20
  component: (0, _BulletedListBlockMenuItem.createBulletedListBlockMenuItem)({
20
21
  api: api
@@ -25,7 +26,7 @@ var getListComponents = exports.getListComponents = function getListComponents(a
25
26
  parent: {
26
27
  type: 'block-menu-section',
27
28
  key: 'nested-menu-format-section-primary',
28
- rank: _blockMenu.FORMAT_NESTED_MENU_RANK[_blockMenu.FORMAT_NUMBERED_LIST_MENU_ITEM.key]
29
+ rank: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_format_rank_revised') ? _blockMenu.FORMAT_NESTED_MENU_RANK_REVISED[_blockMenu.FORMAT_NUMBERED_LIST_MENU_ITEM.key] : _blockMenu.FORMAT_NESTED_MENU_RANK[_blockMenu.FORMAT_NUMBERED_LIST_MENU_ITEM.key]
29
30
  },
30
31
  component: (0, _NumberedListBlockMenuItem.createNumberedListBlockMenuItem)({
31
32
  api: api
package/dist/es2019/ui/BulletedListBlockMenuItem.js CHANGED
@@ -13,6 +13,13 @@ const BulletedListBlockMenuItem = ({
13
13
  formatMessage
14
14
  } = useIntl();
15
15
  const bulletListActive = useSharedPluginStateSelector(api, 'list.bulletListActive');
16
+ const currentSelectedNodeName = useSharedPluginStateSelector(api, 'blockMenu.currentSelectedNodeName');
17
+
18
+ // Check if a blockquote is currently selected
19
+ const isBlockquoteSelected = currentSelectedNodeName === null || currentSelectedNodeName === void 0 ? void 0 : currentSelectedNodeName.includes('blockquote');
20
+
21
+ // Only show as selected if bullet list is active AND we're not selecting a blockquote
22
+ const isSelected = bulletListActive && !isBlockquoteSelected;
16
23
  const handleClick = () => {
17
24
  if (!bulletListActive) {
18
25
  var _api$blockMenu;
@@ -21,7 +28,7 @@ const BulletedListBlockMenuItem = ({
21
28
  };
22
29
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
23
30
  onClick: handleClick,
24
- isSelected: bulletListActive,
31
+ isSelected: isSelected,
25
32
  elemBefore: /*#__PURE__*/React.createElement(ListBulletedIcon, {
26
33
  label: ""
27
34
  })
package/dist/es2019/ui/NumberedListBlockMenuItem.js CHANGED
@@ -11,6 +11,13 @@ const NumberedListBlockMenuItem = ({
11
11
  formatMessage
12
12
  } = useIntl();
13
13
  const orderedListActive = useSharedPluginStateSelector(api, 'list.orderedListActive');
14
+ const currentSelectedNodeName = useSharedPluginStateSelector(api, 'blockMenu.currentSelectedNodeName');
15
+
16
+ // Check if a blockquote is currently selected
17
+ const isBlockquoteSelected = currentSelectedNodeName === null || currentSelectedNodeName === void 0 ? void 0 : currentSelectedNodeName.includes('blockquote');
18
+
19
+ // Only show as selected if ordered list is active AND we're not selecting a blockquote
20
+ const isSelected = orderedListActive && !isBlockquoteSelected;
14
21
  const handleClick = () => {
15
22
  if (!orderedListActive) {
16
23
  var _api$blockMenu;
@@ -19,7 +26,7 @@ const NumberedListBlockMenuItem = ({
19
26
  };
20
27
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
21
28
  onClick: handleClick,
22
- isSelected: orderedListActive,
29
+ isSelected: isSelected,
23
30
  elemBefore: /*#__PURE__*/React.createElement(ListNumberedIcon, {
24
31
  label: ""
25
32
  })
package/dist/es2019/ui/index.js CHANGED
@@ -1,4 +1,5 @@
1
- import { FORMAT_BULLETED_LIST_MENU_ITEM, FORMAT_NESTED_MENU_RANK, FORMAT_NUMBERED_LIST_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
1
+ import { FORMAT_BULLETED_LIST_MENU_ITEM, FORMAT_NESTED_MENU_RANK, FORMAT_NESTED_MENU_RANK_REVISED, FORMAT_NUMBERED_LIST_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { createBulletedListBlockMenuItem } from './BulletedListBlockMenuItem';
3
4
  import { createNumberedListBlockMenuItem } from './NumberedListBlockMenuItem';
4
5
  export const getListComponents = api => {
@@ -8,7 +9,7 @@ export const getListComponents = api => {
8
9
  parent: {
9
10
  type: 'block-menu-section',
10
11
  key: 'nested-menu-format-section-primary',
11
- rank: FORMAT_NESTED_MENU_RANK[FORMAT_BULLETED_LIST_MENU_ITEM.key]
12
+ rank: fg('platform_editor_block_menu_format_rank_revised') ? FORMAT_NESTED_MENU_RANK_REVISED[FORMAT_BULLETED_LIST_MENU_ITEM.key] : FORMAT_NESTED_MENU_RANK[FORMAT_BULLETED_LIST_MENU_ITEM.key]
12
13
  },
13
14
  component: createBulletedListBlockMenuItem({
14
15
  api
@@ -19,7 +20,7 @@ export const getListComponents = api => {
19
20
  parent: {
20
21
  type: 'block-menu-section',
21
22
  key: 'nested-menu-format-section-primary',
22
- rank: FORMAT_NESTED_MENU_RANK[FORMAT_NUMBERED_LIST_MENU_ITEM.key]
23
+ rank: fg('platform_editor_block_menu_format_rank_revised') ? FORMAT_NESTED_MENU_RANK_REVISED[FORMAT_NUMBERED_LIST_MENU_ITEM.key] : FORMAT_NESTED_MENU_RANK[FORMAT_NUMBERED_LIST_MENU_ITEM.key]
23
24
  },
24
25
  component: createNumberedListBlockMenuItem({
25
26
  api
package/dist/esm/ui/BulletedListBlockMenuItem.js CHANGED
@@ -11,6 +11,13 @@ var BulletedListBlockMenuItem = function BulletedListBlockMenuItem(_ref) {
11
11
  var _useIntl = useIntl(),
12
12
  formatMessage = _useIntl.formatMessage;
13
13
  var bulletListActive = useSharedPluginStateSelector(api, 'list.bulletListActive');
14
+ var currentSelectedNodeName = useSharedPluginStateSelector(api, 'blockMenu.currentSelectedNodeName');
15
+
16
+ // Check if a blockquote is currently selected
17
+ var isBlockquoteSelected = currentSelectedNodeName === null || currentSelectedNodeName === void 0 ? void 0 : currentSelectedNodeName.includes('blockquote');
18
+
19
+ // Only show as selected if bullet list is active AND we're not selecting a blockquote
20
+ var isSelected = bulletListActive && !isBlockquoteSelected;
14
21
  var handleClick = function handleClick() {
15
22
  if (!bulletListActive) {
16
23
  var _api$blockMenu;
@@ -19,7 +26,7 @@ var BulletedListBlockMenuItem = function BulletedListBlockMenuItem(_ref) {
19
26
  };
20
27
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
21
28
  onClick: handleClick,
22
- isSelected: bulletListActive,
29
+ isSelected: isSelected,
23
30
  elemBefore: /*#__PURE__*/React.createElement(ListBulletedIcon, {
24
31
  label: ""
25
32
  })
package/dist/esm/ui/NumberedListBlockMenuItem.js CHANGED
@@ -9,6 +9,13 @@ var NumberedListBlockMenuItem = function NumberedListBlockMenuItem(_ref) {
9
9
  var _useIntl = useIntl(),
10
10
  formatMessage = _useIntl.formatMessage;
11
11
  var orderedListActive = useSharedPluginStateSelector(api, 'list.orderedListActive');
12
+ var currentSelectedNodeName = useSharedPluginStateSelector(api, 'blockMenu.currentSelectedNodeName');
13
+
14
+ // Check if a blockquote is currently selected
15
+ var isBlockquoteSelected = currentSelectedNodeName === null || currentSelectedNodeName === void 0 ? void 0 : currentSelectedNodeName.includes('blockquote');
16
+
17
+ // Only show as selected if ordered list is active AND we're not selecting a blockquote
18
+ var isSelected = orderedListActive && !isBlockquoteSelected;
12
19
  var handleClick = function handleClick() {
13
20
  if (!orderedListActive) {
14
21
  var _api$blockMenu;
@@ -17,7 +24,7 @@ var NumberedListBlockMenuItem = function NumberedListBlockMenuItem(_ref) {
17
24
  };
18
25
  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
19
26
  onClick: handleClick,
20
- isSelected: orderedListActive,
27
+ isSelected: isSelected,
21
28
  elemBefore: /*#__PURE__*/React.createElement(ListNumberedIcon, {
22
29
  label: ""
23
30
  })
package/dist/esm/ui/index.js CHANGED
@@ -1,4 +1,5 @@
1
- import { FORMAT_BULLETED_LIST_MENU_ITEM, FORMAT_NESTED_MENU_RANK, FORMAT_NUMBERED_LIST_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
1
+ import { FORMAT_BULLETED_LIST_MENU_ITEM, FORMAT_NESTED_MENU_RANK, FORMAT_NESTED_MENU_RANK_REVISED, FORMAT_NUMBERED_LIST_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { createBulletedListBlockMenuItem } from './BulletedListBlockMenuItem';
3
4
  import { createNumberedListBlockMenuItem } from './NumberedListBlockMenuItem';
4
5
  export var getListComponents = function getListComponents(api) {
@@ -8,7 +9,7 @@ export var getListComponents = function getListComponents(api) {
8
9
  parent: {
9
10
  type: 'block-menu-section',
10
11
  key: 'nested-menu-format-section-primary',
11
- rank: FORMAT_NESTED_MENU_RANK[FORMAT_BULLETED_LIST_MENU_ITEM.key]
12
+ rank: fg('platform_editor_block_menu_format_rank_revised') ? FORMAT_NESTED_MENU_RANK_REVISED[FORMAT_BULLETED_LIST_MENU_ITEM.key] : FORMAT_NESTED_MENU_RANK[FORMAT_BULLETED_LIST_MENU_ITEM.key]
12
13
  },
13
14
  component: createBulletedListBlockMenuItem({
14
15
  api: api
@@ -19,7 +20,7 @@ export var getListComponents = function getListComponents(api) {
19
20
  parent: {
20
21
  type: 'block-menu-section',
21
22
  key: 'nested-menu-format-section-primary',
22
- rank: FORMAT_NESTED_MENU_RANK[FORMAT_NUMBERED_LIST_MENU_ITEM.key]
23
+ rank: fg('platform_editor_block_menu_format_rank_revised') ? FORMAT_NESTED_MENU_RANK_REVISED[FORMAT_NUMBERED_LIST_MENU_ITEM.key] : FORMAT_NESTED_MENU_RANK[FORMAT_NUMBERED_LIST_MENU_ITEM.key]
23
24
  },
24
25
  component: createNumberedListBlockMenuItem({
25
26
  api: api
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-list",
3
- "version": "7.2.1",
3
+ "version": "7.2.3",
4
4
  "description": "List plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -29,18 +29,18 @@
29
29
  "dependencies": {
30
30
  "@atlaskit/adf-schema": "^51.1.2",
31
31
  "@atlaskit/editor-plugin-analytics": "^5.2.0",
32
- "@atlaskit/editor-plugin-block-menu": "^3.1.0",
32
+ "@atlaskit/editor-plugin-block-menu": "^3.2.0",
33
33
  "@atlaskit/editor-plugin-feature-flags": "^4.0.0",
34
34
  "@atlaskit/editor-prosemirror": "7.0.0",
35
35
  "@atlaskit/editor-toolbar": "^0.9.0",
36
- "@atlaskit/icon": "^28.1.0",
36
+ "@atlaskit/icon": "^28.2.0",
37
37
  "@atlaskit/platform-feature-flags": "^1.1.0",
38
38
  "@atlaskit/prosemirror-input-rules": "^3.4.0",
39
- "@atlaskit/tmp-editor-statsig": "^12.21.0",
39
+ "@atlaskit/tmp-editor-statsig": "^12.28.0",
40
40
  "@babel/runtime": "^7.0.0"
41
41
  },
42
42
  "peerDependencies": {
43
- "@atlaskit/editor-common": "^109.6.0",
43
+ "@atlaskit/editor-common": "^109.11.0",
44
44
  "react": "^18.2.0",
45
45
  "react-intl-next": "npm:react-intl@^5.18.1"
46
46
  },
@@ -85,6 +85,9 @@
85
85
  },
86
86
  "platform_editor_adf_with_localid": {
87
87
  "type": "boolean"
88
+ },
89
+ "platform_editor_block_menu_format_rank_revised": {
90
+ "type": "boolean"
88
91
  }
89
92
  },
90
93
  "stricter": {