@atlaskit/editor-plugin-track-changes 2.7.6 → 2.7.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,20 @@
1
1
  # @atlaskit/editor-plugin-track-changes
2
2
 
3
+ ## 2.7.8
4
+
5
+ ### Patch Changes
6
+
7
+ - [`bbe3cf6be3b74`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bbe3cf6be3b74) -
8
+ [EDITOR-1427-tooltip-not-showing-old-editor] Refactoring new toolbar component, added tooltip to
9
+ old toolbar track changes button
10
+ - Updated dependencies
11
+
12
+ ## 2.7.7
13
+
14
+ ### Patch Changes
15
+
16
+ - Updated dependencies
17
+
3
18
  ## 2.7.6
4
19
 
5
20
  ### Patch Changes
@@ -53,4 +53,4 @@
53
53
  "path": "../../editor-common/afm-cc/tsconfig.json"
54
54
  }
55
55
  ]
56
- }
56
+ }
@@ -10,7 +10,8 @@ var _reactIntlNext = require("react-intl-next");
10
10
  var _new = require("@atlaskit/button/new");
11
11
  var _hooks = require("@atlaskit/editor-common/hooks");
12
12
  var _messages = require("@atlaskit/editor-common/messages");
13
- var _history = _interopRequireDefault(require("@atlaskit/icon-lab/core/history"));
13
+ var _editorToolbar = require("@atlaskit/editor-toolbar");
14
+ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
14
15
  var TrackChangesToolbarButton = exports.TrackChangesToolbarButton = function TrackChangesToolbarButton(_ref) {
15
16
  var api = _ref.api;
16
17
  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['trackChanges'], function (states) {
@@ -33,12 +34,22 @@ var TrackChangesToolbarButton = exports.TrackChangesToolbarButton = function Tra
33
34
  api === null || api === void 0 || api.core.actions.focus();
34
35
  }
35
36
  }, [api, isDisplayingChanges]);
36
- return /*#__PURE__*/_react.default.createElement(_new.IconButton, {
37
- icon: _history.default,
37
+ return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
38
+ content: formatMessage(_messages.trackChangesMessages.toolbarIconLabel)
39
+ }, (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
40
+ iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.HistoryIcon, {
41
+ label: formatMessage(_messages.trackChangesMessages.toolbarIconLabel),
42
+ size: "small"
43
+ }),
44
+ onClick: handleClick,
45
+ isDisabled: !isShowDiffAvailable,
46
+ isSelected: isDisplayingChanges
47
+ }) : /*#__PURE__*/_react.default.createElement(_new.IconButton, {
48
+ icon: _editorToolbar.HistoryIcon,
38
49
  label: formatMessage(_messages.trackChangesMessages.toolbarIconLabel),
39
50
  appearance: "subtle",
40
51
  isDisabled: !isShowDiffAvailable,
41
52
  isSelected: isDisplayingChanges,
42
53
  onClick: handleClick
43
- });
54
+ }));
44
55
  };
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.getToolbarComponents = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _toolbar = require("@atlaskit/editor-common/toolbar");
10
- var _TrackChangesButtonNew = require("./TrackChangesButtonNew");
10
+ var _TrackChangesToolbarButton = require("./TrackChangesToolbarButton");
11
11
  var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api) {
12
12
  return [{
13
13
  type: _toolbar.TRACK_CHANGES_SECTION.type,
@@ -34,7 +34,7 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
34
34
  rank: _toolbar.TRACK_CHANGES_GROUP_RANK[_toolbar.TRACK_CHANGES_BUTTON.key]
35
35
  }],
36
36
  component: function component() {
37
- return /*#__PURE__*/_react.default.createElement(_TrackChangesButtonNew.TrackChangesButtonNew, {
37
+ return /*#__PURE__*/_react.default.createElement(_TrackChangesToolbarButton.TrackChangesToolbarButton, {
38
38
  api: api
39
39
  });
40
40
  }
@@ -3,7 +3,8 @@ import { useIntl } from 'react-intl-next';
3
3
  import { IconButton } from '@atlaskit/button/new';
4
4
  import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
5
5
  import { trackChangesMessages } from '@atlaskit/editor-common/messages';
6
- import HistoryIcon from '@atlaskit/icon-lab/core/history';
6
+ import { ToolbarButton, ToolbarTooltip, HistoryIcon } from '@atlaskit/editor-toolbar';
7
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
8
  export const TrackChangesToolbarButton = ({
8
9
  api
9
10
  }) => {
@@ -29,12 +30,22 @@ export const TrackChangesToolbarButton = ({
29
30
  api === null || api === void 0 ? void 0 : api.core.actions.focus();
30
31
  }
31
32
  }, [api, isDisplayingChanges]);
32
- return /*#__PURE__*/React.createElement(IconButton, {
33
+ return /*#__PURE__*/React.createElement(ToolbarTooltip, {
34
+ content: formatMessage(trackChangesMessages.toolbarIconLabel)
35
+ }, expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolbarButton, {
36
+ iconBefore: /*#__PURE__*/React.createElement(HistoryIcon, {
37
+ label: formatMessage(trackChangesMessages.toolbarIconLabel),
38
+ size: "small"
39
+ }),
40
+ onClick: handleClick,
41
+ isDisabled: !isShowDiffAvailable,
42
+ isSelected: isDisplayingChanges
43
+ }) : /*#__PURE__*/React.createElement(IconButton, {
33
44
  icon: HistoryIcon,
34
45
  label: formatMessage(trackChangesMessages.toolbarIconLabel),
35
46
  appearance: "subtle",
36
47
  isDisabled: !isShowDiffAvailable,
37
48
  isSelected: isDisplayingChanges,
38
49
  onClick: handleClick
39
- });
50
+ }));
40
51
  };
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_BUTTON, TRACK_CHANGES_GROUP, TRACK_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
3
- import { TrackChangesButtonNew } from './TrackChangesButtonNew';
3
+ import { TrackChangesToolbarButton } from './TrackChangesToolbarButton';
4
4
  export const getToolbarComponents = api => {
5
5
  return [{
6
6
  type: TRACK_CHANGES_SECTION.type,
@@ -26,7 +26,7 @@ export const getToolbarComponents = api => {
26
26
  key: TRACK_CHANGES_GROUP.key,
27
27
  rank: TRACK_CHANGES_GROUP_RANK[TRACK_CHANGES_BUTTON.key]
28
28
  }],
29
- component: () => /*#__PURE__*/React.createElement(TrackChangesButtonNew, {
29
+ component: () => /*#__PURE__*/React.createElement(TrackChangesToolbarButton, {
30
30
  api: api
31
31
  })
32
32
  }];
@@ -3,7 +3,8 @@ import { useIntl } from 'react-intl-next';
3
3
  import { IconButton } from '@atlaskit/button/new';
4
4
  import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
5
5
  import { trackChangesMessages } from '@atlaskit/editor-common/messages';
6
- import HistoryIcon from '@atlaskit/icon-lab/core/history';
6
+ import { ToolbarButton, ToolbarTooltip, HistoryIcon } from '@atlaskit/editor-toolbar';
7
+ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
7
8
  export var TrackChangesToolbarButton = function TrackChangesToolbarButton(_ref) {
8
9
  var api = _ref.api;
9
10
  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['trackChanges'], function (states) {
@@ -26,12 +27,22 @@ export var TrackChangesToolbarButton = function TrackChangesToolbarButton(_ref)
26
27
  api === null || api === void 0 || api.core.actions.focus();
27
28
  }
28
29
  }, [api, isDisplayingChanges]);
29
- return /*#__PURE__*/React.createElement(IconButton, {
30
+ return /*#__PURE__*/React.createElement(ToolbarTooltip, {
31
+ content: formatMessage(trackChangesMessages.toolbarIconLabel)
32
+ }, expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true) ? /*#__PURE__*/React.createElement(ToolbarButton, {
33
+ iconBefore: /*#__PURE__*/React.createElement(HistoryIcon, {
34
+ label: formatMessage(trackChangesMessages.toolbarIconLabel),
35
+ size: "small"
36
+ }),
37
+ onClick: handleClick,
38
+ isDisabled: !isShowDiffAvailable,
39
+ isSelected: isDisplayingChanges
40
+ }) : /*#__PURE__*/React.createElement(IconButton, {
30
41
  icon: HistoryIcon,
31
42
  label: formatMessage(trackChangesMessages.toolbarIconLabel),
32
43
  appearance: "subtle",
33
44
  isDisabled: !isShowDiffAvailable,
34
45
  isSelected: isDisplayingChanges,
35
46
  onClick: handleClick
36
- });
47
+ }));
37
48
  };
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_BUTTON, TRACK_CHANGES_GROUP, TRACK_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
3
- import { TrackChangesButtonNew } from './TrackChangesButtonNew';
3
+ import { TrackChangesToolbarButton } from './TrackChangesToolbarButton';
4
4
  export var getToolbarComponents = function getToolbarComponents(api) {
5
5
  return [{
6
6
  type: TRACK_CHANGES_SECTION.type,
@@ -27,7 +27,7 @@ export var getToolbarComponents = function getToolbarComponents(api) {
27
27
  rank: TRACK_CHANGES_GROUP_RANK[TRACK_CHANGES_BUTTON.key]
28
28
  }],
29
29
  component: function component() {
30
- return /*#__PURE__*/React.createElement(TrackChangesButtonNew, {
30
+ return /*#__PURE__*/React.createElement(TrackChangesToolbarButton, {
31
31
  api: api
32
32
  });
33
33
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-track-changes",
3
- "version": "2.7.6",
3
+ "version": "2.7.8",
4
4
  "description": "ShowDiff plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -34,18 +34,18 @@
34
34
  "@atlaskit/button": "^23.4.0",
35
35
  "@atlaskit/editor-plugin-history": "3.1.1",
36
36
  "@atlaskit/editor-plugin-primary-toolbar": "^4.1.0",
37
- "@atlaskit/editor-plugin-show-diff": "0.1.6",
37
+ "@atlaskit/editor-plugin-show-diff": "0.1.7",
38
38
  "@atlaskit/editor-plugin-toolbar": "^0.4.0",
39
39
  "@atlaskit/editor-prosemirror": "7.0.0",
40
40
  "@atlaskit/editor-toolbar": "^0.3.0",
41
41
  "@atlaskit/editor-toolbar-model": "^0.1.0",
42
- "@atlaskit/icon-lab": "^5.6.0",
43
- "@atlaskit/tmp-editor-statsig": "^11.6.0",
42
+ "@atlaskit/icon-lab": "^5.7.0",
43
+ "@atlaskit/tmp-editor-statsig": "^11.8.0",
44
44
  "@babel/runtime": "^7.0.0",
45
45
  "react-intl-next": "npm:react-intl@^5.18.1"
46
46
  },
47
47
  "peerDependencies": {
48
- "@atlaskit/editor-common": "^107.29.0",
48
+ "@atlaskit/editor-common": "^107.31.0",
49
49
  "react": "^18.2.0"
50
50
  },
51
51
  "techstack": {
@@ -1,46 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- Object.defineProperty(exports, "__esModule", {
5
- value: true
6
- });
7
- exports.TrackChangesButtonNew = void 0;
8
- var _react = _interopRequireDefault(require("react"));
9
- var _reactIntlNext = require("react-intl-next");
10
- var _hooks = require("@atlaskit/editor-common/hooks");
11
- var _messages = require("@atlaskit/editor-common/messages");
12
- var _editorToolbar = require("@atlaskit/editor-toolbar");
13
- var TrackChangesButtonNew = exports.TrackChangesButtonNew = function TrackChangesButtonNew(_ref) {
14
- var api = _ref.api;
15
- var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['trackChanges'], function (states) {
16
- var _states$trackChangesS, _states$trackChangesS2;
17
- return {
18
- isDisplayingChanges: (_states$trackChangesS = states.trackChangesState) === null || _states$trackChangesS === void 0 ? void 0 : _states$trackChangesS.isDisplayingChanges,
19
- isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable
20
- };
21
- }),
22
- isDisplayingChanges = _useSharedPluginState.isDisplayingChanges,
23
- isShowDiffAvailable = _useSharedPluginState.isShowDiffAvailable;
24
- var _useIntl = (0, _reactIntlNext.useIntl)(),
25
- formatMessage = _useIntl.formatMessage;
26
- var handleClick = _react.default.useCallback(function () {
27
- var _api$trackChanges;
28
- var wasShowingDiffSelected = isDisplayingChanges;
29
- var result = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.commands.toggleChanges);
30
- // On de-selection - focus back on the editor
31
- if (result && wasShowingDiffSelected) {
32
- api === null || api === void 0 || api.core.actions.focus();
33
- }
34
- }, [api, isDisplayingChanges]);
35
- return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
36
- content: formatMessage(_messages.trackChangesMessages.toolbarIconLabel)
37
- }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
38
- iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.HistoryIcon, {
39
- label: formatMessage(_messages.trackChangesMessages.toolbarIconLabel),
40
- size: "small"
41
- }),
42
- onClick: handleClick,
43
- isDisabled: !isShowDiffAvailable,
44
- isSelected: isDisplayingChanges
45
- }));
46
- };
@@ -1,42 +0,0 @@
1
- import React from 'react';
2
- import { useIntl } from 'react-intl-next';
3
- import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
4
- import { trackChangesMessages } from '@atlaskit/editor-common/messages';
5
- import { ToolbarButton, ToolbarTooltip, HistoryIcon } from '@atlaskit/editor-toolbar';
6
- export const TrackChangesButtonNew = ({
7
- api
8
- }) => {
9
- const {
10
- isDisplayingChanges,
11
- isShowDiffAvailable
12
- } = useSharedPluginStateWithSelector(api, ['trackChanges'], states => {
13
- var _states$trackChangesS, _states$trackChangesS2;
14
- return {
15
- isDisplayingChanges: (_states$trackChangesS = states.trackChangesState) === null || _states$trackChangesS === void 0 ? void 0 : _states$trackChangesS.isDisplayingChanges,
16
- isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable
17
- };
18
- });
19
- const {
20
- formatMessage
21
- } = useIntl();
22
- const handleClick = React.useCallback(() => {
23
- var _api$trackChanges;
24
- const wasShowingDiffSelected = isDisplayingChanges;
25
- const result = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.commands.toggleChanges);
26
- // On de-selection - focus back on the editor
27
- if (result && wasShowingDiffSelected) {
28
- api === null || api === void 0 ? void 0 : api.core.actions.focus();
29
- }
30
- }, [api, isDisplayingChanges]);
31
- return /*#__PURE__*/React.createElement(ToolbarTooltip, {
32
- content: formatMessage(trackChangesMessages.toolbarIconLabel)
33
- }, /*#__PURE__*/React.createElement(ToolbarButton, {
34
- iconBefore: /*#__PURE__*/React.createElement(HistoryIcon, {
35
- label: formatMessage(trackChangesMessages.toolbarIconLabel),
36
- size: "small"
37
- }),
38
- onClick: handleClick,
39
- isDisabled: !isShowDiffAvailable,
40
- isSelected: isDisplayingChanges
41
- }));
42
- };
@@ -1,39 +0,0 @@
1
- import React from 'react';
2
- import { useIntl } from 'react-intl-next';
3
- import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
4
- import { trackChangesMessages } from '@atlaskit/editor-common/messages';
5
- import { ToolbarButton, ToolbarTooltip, HistoryIcon } from '@atlaskit/editor-toolbar';
6
- export var TrackChangesButtonNew = function TrackChangesButtonNew(_ref) {
7
- var api = _ref.api;
8
- var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['trackChanges'], function (states) {
9
- var _states$trackChangesS, _states$trackChangesS2;
10
- return {
11
- isDisplayingChanges: (_states$trackChangesS = states.trackChangesState) === null || _states$trackChangesS === void 0 ? void 0 : _states$trackChangesS.isDisplayingChanges,
12
- isShowDiffAvailable: (_states$trackChangesS2 = states.trackChangesState) === null || _states$trackChangesS2 === void 0 ? void 0 : _states$trackChangesS2.isShowDiffAvailable
13
- };
14
- }),
15
- isDisplayingChanges = _useSharedPluginState.isDisplayingChanges,
16
- isShowDiffAvailable = _useSharedPluginState.isShowDiffAvailable;
17
- var _useIntl = useIntl(),
18
- formatMessage = _useIntl.formatMessage;
19
- var handleClick = React.useCallback(function () {
20
- var _api$trackChanges;
21
- var wasShowingDiffSelected = isDisplayingChanges;
22
- var result = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$trackChanges = api.trackChanges) === null || _api$trackChanges === void 0 ? void 0 : _api$trackChanges.commands.toggleChanges);
23
- // On de-selection - focus back on the editor
24
- if (result && wasShowingDiffSelected) {
25
- api === null || api === void 0 || api.core.actions.focus();
26
- }
27
- }, [api, isDisplayingChanges]);
28
- return /*#__PURE__*/React.createElement(ToolbarTooltip, {
29
- content: formatMessage(trackChangesMessages.toolbarIconLabel)
30
- }, /*#__PURE__*/React.createElement(ToolbarButton, {
31
- iconBefore: /*#__PURE__*/React.createElement(HistoryIcon, {
32
- label: formatMessage(trackChangesMessages.toolbarIconLabel),
33
- size: "small"
34
- }),
35
- onClick: handleClick,
36
- isDisabled: !isShowDiffAvailable,
37
- isSelected: isDisplayingChanges
38
- }));
39
- };
@@ -1,8 +0,0 @@
1
- import React from 'react';
2
- import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
3
- import { type TrackChangesPlugin } from '../trackChangesPluginType';
4
- type TrackChangesButtonNewProps = {
5
- api?: ExtractInjectionAPI<TrackChangesPlugin>;
6
- };
7
- export declare const TrackChangesButtonNew: ({ api }: TrackChangesButtonNewProps) => React.JSX.Element;
8
- export {};
@@ -1,8 +0,0 @@
1
- import React from 'react';
2
- import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
3
- import { type TrackChangesPlugin } from '../trackChangesPluginType';
4
- type TrackChangesButtonNewProps = {
5
- api?: ExtractInjectionAPI<TrackChangesPlugin>;
6
- };
7
- export declare const TrackChangesButtonNew: ({ api }: TrackChangesButtonNewProps) => React.JSX.Element;
8
- export {};