@atlaskit/editor-plugin-floating-toolbar 4.1.7 → 4.1.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,14 @@
1
1
  # @atlaskit/editor-plugin-floating-toolbar
2
2
 
3
+ ## 4.1.8
4
+
5
+ ### Patch Changes
6
+
7
+ - [#157322](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/157322)
8
+ [`0e61040734cef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0e61040734cef) -
9
+ [ED-27842] Consolidate extraneous no_cursor flags into one flag for full rollout
10
+ - Updated dependencies
11
+
3
12
  ## 4.1.7
4
13
 
5
14
  ### Patch Changes
@@ -176,15 +176,17 @@ var floatingToolbarPlugin = exports.floatingToolbarPlugin = function floatingToo
176
176
  }
177
177
  },
178
178
  getSharedState: function getSharedState(editorState) {
179
- var _api$interaction;
179
+ var _api$interaction, _api$interaction2;
180
180
  if (!editorState) {
181
181
  return undefined;
182
182
  }
183
- var hasHadInteraction = api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction;
183
+ var _hasHadInteraction = api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction;
184
+ var interactionState = api === null || api === void 0 || (_api$interaction2 = api.interaction) === null || _api$interaction2 === void 0 || (_api$interaction2 = _api$interaction2.sharedState.currentState()) === null || _api$interaction2 === void 0 ? void 0 : _api$interaction2.interactionState;
184
185
  var configWithNodeInfo;
185
- if ((0, _platformFeatureFlags.fg)('platform_editor_no_selection_until_interaction')) {
186
+ if ((0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init')) {
186
187
  var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
187
- configWithNodeInfo = hasHadInteraction !== false ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
188
+ var hasHadInteraction = (0, _platformFeatureFlags.fg)('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : _hasHadInteraction !== false;
189
+ configWithNodeInfo = hasHadInteraction ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
188
190
  } else {
189
191
  var _pluginKey$getState$g3, _pluginKey$getState2, _pluginKey$getState2$;
190
192
  configWithNodeInfo = (_pluginKey$getState$g3 = (_pluginKey$getState2 = pluginKey.getState(editorState)) === null || _pluginKey$getState2 === void 0 || (_pluginKey$getState2$ = _pluginKey$getState2.getConfigWithNodeInfo) === null || _pluginKey$getState2$ === void 0 ? void 0 : _pluginKey$getState2$.call(_pluginKey$getState2, editorState)) !== null && _pluginKey$getState$g3 !== void 0 ? _pluginKey$getState$g3 : undefined;
@@ -158,15 +158,17 @@ export const floatingToolbarPlugin = ({
158
158
  }
159
159
  },
160
160
  getSharedState(editorState) {
161
- var _api$interaction, _api$interaction$shar;
161
+ var _api$interaction, _api$interaction$shar, _api$interaction2, _api$interaction2$sha;
162
162
  if (!editorState) {
163
163
  return undefined;
164
164
  }
165
- const hasHadInteraction = api === null || api === void 0 ? void 0 : (_api$interaction = api.interaction) === null || _api$interaction === void 0 ? void 0 : (_api$interaction$shar = _api$interaction.sharedState.currentState()) === null || _api$interaction$shar === void 0 ? void 0 : _api$interaction$shar.hasHadInteraction;
165
+ const _hasHadInteraction = api === null || api === void 0 ? void 0 : (_api$interaction = api.interaction) === null || _api$interaction === void 0 ? void 0 : (_api$interaction$shar = _api$interaction.sharedState.currentState()) === null || _api$interaction$shar === void 0 ? void 0 : _api$interaction$shar.hasHadInteraction;
166
+ const interactionState = api === null || api === void 0 ? void 0 : (_api$interaction2 = api.interaction) === null || _api$interaction2 === void 0 ? void 0 : (_api$interaction2$sha = _api$interaction2.sharedState.currentState()) === null || _api$interaction2$sha === void 0 ? void 0 : _api$interaction2$sha.interactionState;
166
167
  let configWithNodeInfo;
167
- if (fg('platform_editor_no_selection_until_interaction')) {
168
+ if (fg('platform_editor_no_cursor_on_live_doc_init')) {
168
169
  var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
169
- configWithNodeInfo = hasHadInteraction !== false ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 ? void 0 : (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
170
+ const hasHadInteraction = fg('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : _hasHadInteraction !== false;
171
+ configWithNodeInfo = hasHadInteraction ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 ? void 0 : (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
170
172
  } else {
171
173
  var _pluginKey$getState$g3, _pluginKey$getState2, _pluginKey$getState2$;
172
174
  configWithNodeInfo = (_pluginKey$getState$g3 = (_pluginKey$getState2 = pluginKey.getState(editorState)) === null || _pluginKey$getState2 === void 0 ? void 0 : (_pluginKey$getState2$ = _pluginKey$getState2.getConfigWithNodeInfo) === null || _pluginKey$getState2$ === void 0 ? void 0 : _pluginKey$getState2$.call(_pluginKey$getState2, editorState)) !== null && _pluginKey$getState$g3 !== void 0 ? _pluginKey$getState$g3 : undefined;
@@ -164,15 +164,17 @@ export var floatingToolbarPlugin = function floatingToolbarPlugin(_ref) {
164
164
  }
165
165
  },
166
166
  getSharedState: function getSharedState(editorState) {
167
- var _api$interaction;
167
+ var _api$interaction, _api$interaction2;
168
168
  if (!editorState) {
169
169
  return undefined;
170
170
  }
171
- var hasHadInteraction = api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction;
171
+ var _hasHadInteraction = api === null || api === void 0 || (_api$interaction = api.interaction) === null || _api$interaction === void 0 || (_api$interaction = _api$interaction.sharedState.currentState()) === null || _api$interaction === void 0 ? void 0 : _api$interaction.hasHadInteraction;
172
+ var interactionState = api === null || api === void 0 || (_api$interaction2 = api.interaction) === null || _api$interaction2 === void 0 || (_api$interaction2 = _api$interaction2.sharedState.currentState()) === null || _api$interaction2 === void 0 ? void 0 : _api$interaction2.interactionState;
172
173
  var configWithNodeInfo;
173
- if (fg('platform_editor_no_selection_until_interaction')) {
174
+ if (fg('platform_editor_no_cursor_on_live_doc_init')) {
174
175
  var _pluginKey$getState$g, _pluginKey$getState, _pluginKey$getState$g2;
175
- configWithNodeInfo = hasHadInteraction !== false ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
176
+ var hasHadInteraction = fg('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : _hasHadInteraction !== false;
177
+ configWithNodeInfo = hasHadInteraction ? (_pluginKey$getState$g = (_pluginKey$getState = pluginKey.getState(editorState)) === null || _pluginKey$getState === void 0 || (_pluginKey$getState$g2 = _pluginKey$getState.getConfigWithNodeInfo) === null || _pluginKey$getState$g2 === void 0 ? void 0 : _pluginKey$getState$g2.call(_pluginKey$getState, editorState)) !== null && _pluginKey$getState$g !== void 0 ? _pluginKey$getState$g : undefined : undefined;
176
178
  } else {
177
179
  var _pluginKey$getState$g3, _pluginKey$getState2, _pluginKey$getState2$;
178
180
  configWithNodeInfo = (_pluginKey$getState$g3 = (_pluginKey$getState2 = pluginKey.getState(editorState)) === null || _pluginKey$getState2 === void 0 || (_pluginKey$getState2$ = _pluginKey$getState2.getConfigWithNodeInfo) === null || _pluginKey$getState2$ === void 0 ? void 0 : _pluginKey$getState2$.call(_pluginKey$getState2, editorState)) !== null && _pluginKey$getState$g3 !== void 0 ? _pluginKey$getState$g3 : undefined;
@@ -1,2 +1,2 @@
1
- import { Command, FloatingToolbarOverflowDropdown } from '@atlaskit/editor-common/types';
1
+ import type { Command, FloatingToolbarOverflowDropdown } from '@atlaskit/editor-common/types';
2
2
  export declare const consolidateOverflowDropdownItems: (overflowDropdowns: FloatingToolbarOverflowDropdown<Command>[]) => FloatingToolbarOverflowDropdown<Command>;
@@ -1,2 +1,2 @@
1
- import { Command, FloatingToolbarOverflowDropdown } from '@atlaskit/editor-common/types';
1
+ import type { Command, FloatingToolbarOverflowDropdown } from '@atlaskit/editor-common/types';
2
2
  export declare const consolidateOverflowDropdownItems: (overflowDropdowns: FloatingToolbarOverflowDropdown<Command>[]) => FloatingToolbarOverflowDropdown<Command>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-floating-toolbar",
3
- "version": "4.1.7",
3
+ "version": "4.1.8",
4
4
  "description": "Floating toolbar plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -26,9 +26,9 @@
26
26
  },
27
27
  "dependencies": {
28
28
  "@atlaskit/adf-utils": "^19.19.0",
29
- "@atlaskit/button": "^23.0.0",
29
+ "@atlaskit/button": "^23.2.0",
30
30
  "@atlaskit/checkbox": "^17.1.0",
31
- "@atlaskit/editor-common": "^105.5.0",
31
+ "@atlaskit/editor-common": "^105.8.0",
32
32
  "@atlaskit/editor-palette": "^2.1.0",
33
33
  "@atlaskit/editor-plugin-analytics": "^2.3.0",
34
34
  "@atlaskit/editor-plugin-context-panel": "^4.1.0",
@@ -37,21 +37,21 @@
37
37
  "@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
38
38
  "@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
39
39
  "@atlaskit/editor-plugin-emoji": "^3.6.0",
40
- "@atlaskit/editor-plugin-extension": "^5.3.0",
41
- "@atlaskit/editor-plugin-interaction": "^1.0.0",
42
- "@atlaskit/editor-plugin-table": "^10.9.0",
40
+ "@atlaskit/editor-plugin-extension": "^5.4.0",
41
+ "@atlaskit/editor-plugin-interaction": "^1.1.0",
42
+ "@atlaskit/editor-plugin-table": "^10.10.0",
43
43
  "@atlaskit/editor-plugin-user-intent": "^0.1.0",
44
44
  "@atlaskit/editor-prosemirror": "7.0.0",
45
45
  "@atlaskit/emoji": "^69.2.0",
46
- "@atlaskit/icon": "^26.0.0",
47
- "@atlaskit/menu": "^7.0.0",
46
+ "@atlaskit/icon": "^26.1.0",
47
+ "@atlaskit/menu": "^7.1.0",
48
48
  "@atlaskit/modal-dialog": "^14.2.0",
49
49
  "@atlaskit/platform-feature-flags": "^1.1.0",
50
- "@atlaskit/primitives": "^14.7.0",
51
- "@atlaskit/select": "^20.5.0",
50
+ "@atlaskit/primitives": "^14.8.0",
51
+ "@atlaskit/select": "^20.6.0",
52
52
  "@atlaskit/theme": "^18.0.0",
53
- "@atlaskit/tmp-editor-statsig": "^4.22.0",
54
- "@atlaskit/tokens": "^4.8.0",
53
+ "@atlaskit/tmp-editor-statsig": "^4.23.0",
54
+ "@atlaskit/tokens": "^4.9.0",
55
55
  "@atlaskit/tooltip": "^20.0.0",
56
56
  "@babel/runtime": "^7.0.0",
57
57
  "@emotion/react": "^11.7.1",
@@ -134,7 +134,7 @@
134
134
  "platform_editor_controls_patch_4": {
135
135
  "type": "boolean"
136
136
  },
137
- "platform_editor_no_selection_until_interaction": {
137
+ "platform_editor_no_cursor_on_live_doc_init": {
138
138
  "type": "boolean"
139
139
  },
140
140
  "platform_editor_remove_slow_table_transactions": {
@@ -151,6 +151,9 @@
151
151
  },
152
152
  "platform_editor_controls_patch_8": {
153
153
  "type": "boolean"
154
+ },
155
+ "platform_editor_interaction_api_refactor": {
156
+ "type": "boolean"
154
157
  }
155
158
  }
156
159
  }