@atlaskit/editor-plugin-type-ahead 2.7.16 → 2.7.18
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 +15 -0
- package/dist/cjs/ui/InputQuery.js +7 -7
- package/dist/cjs/ui/TypeAheadPopup.js +5 -5
- package/dist/es2019/ui/InputQuery.js +7 -7
- package/dist/es2019/ui/TypeAheadPopup.js +5 -5
- package/dist/esm/ui/InputQuery.js +7 -7
- package/dist/esm/ui/TypeAheadPopup.js +5 -5
- package/package.json +5 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-type-ahead
|
|
2
2
|
|
|
3
|
+
## 2.7.18
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#172583](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/172583)
|
|
8
|
+
[`40f387a0c0962`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/40f387a0c0962) -
|
|
9
|
+
Clean up platform_editor_controls_patch_2
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 2.7.17
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
3
18
|
## 2.7.16
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
|
@@ -110,7 +110,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
110
110
|
query = _useState2[0],
|
|
111
111
|
setQuery = _useState2[1];
|
|
112
112
|
var isEditorInsertionEnabled = (0, _experiments.editorExperiment)('platform_editor_insertion', 'variant1');
|
|
113
|
-
var
|
|
113
|
+
var isEditorControlsEnabled = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
|
|
114
114
|
var isSearchPlaceholderEnabled = isEditorInsertionEnabled || (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_quick_insert_placeholder');
|
|
115
115
|
var selection = editorView.state.selection;
|
|
116
116
|
var table = editorView.state.schema.nodes.table;
|
|
@@ -157,7 +157,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
157
157
|
cancel({
|
|
158
158
|
forceFocusOnEditor: true,
|
|
159
159
|
text: ' ',
|
|
160
|
-
addPrefixTrigger:
|
|
160
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
161
161
|
setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED
|
|
162
162
|
});
|
|
163
163
|
stopDefault = true;
|
|
@@ -170,7 +170,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
170
170
|
cancel({
|
|
171
171
|
text: text,
|
|
172
172
|
forceFocusOnEditor: true,
|
|
173
|
-
addPrefixTrigger:
|
|
173
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
174
174
|
setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED
|
|
175
175
|
});
|
|
176
176
|
stopDefault = true;
|
|
@@ -242,7 +242,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
242
242
|
event.preventDefault();
|
|
243
243
|
return false;
|
|
244
244
|
}
|
|
245
|
-
}, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state,
|
|
245
|
+
}, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state, isEditorControlsEnabled]);
|
|
246
246
|
var onClick = (0, _react.useCallback)(function (event) {
|
|
247
247
|
var _inputRef$current;
|
|
248
248
|
event.stopPropagation();
|
|
@@ -274,7 +274,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
274
274
|
}
|
|
275
275
|
cancel({
|
|
276
276
|
forceFocusOnEditor: true,
|
|
277
|
-
addPrefixTrigger:
|
|
277
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
278
278
|
text: cleanedInputContent(),
|
|
279
279
|
setSelectionAt: isMovingRight ? _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED : _constants.CloseSelectionOptions.BEFORE_TEXT_INSERTED
|
|
280
280
|
});
|
|
@@ -304,7 +304,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
304
304
|
return;
|
|
305
305
|
}
|
|
306
306
|
cancel({
|
|
307
|
-
addPrefixTrigger:
|
|
307
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
308
308
|
text: cleanedInputContent(),
|
|
309
309
|
setSelectionAt: _constants.CloseSelectionOptions.BEFORE_TEXT_INSERTED,
|
|
310
310
|
forceFocusOnEditor: false
|
|
@@ -404,7 +404,7 @@ var InputQuery = exports.InputQuery = /*#__PURE__*/_react.default.memo(function
|
|
|
404
404
|
element.removeEventListener('input', onInput);
|
|
405
405
|
}
|
|
406
406
|
};
|
|
407
|
-
}, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state,
|
|
407
|
+
}, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state, isEditorControlsEnabled]);
|
|
408
408
|
(0, _react.useLayoutEffect)(function () {
|
|
409
409
|
var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
|
|
410
410
|
if (ref.current && forceFocus) {
|
|
@@ -96,7 +96,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
|
|
|
96
96
|
var _useSharedState = useSharedState(api),
|
|
97
97
|
moreElementsInQuickInsertView = _useSharedState.moreElementsInQuickInsertView;
|
|
98
98
|
var moreElementsInQuickInsertViewEnabled = moreElementsInQuickInsertView && triggerHandler.id === _typeAhead.TypeAheadAvailableNodes.QUICK_INSERT;
|
|
99
|
-
var
|
|
99
|
+
var isEditorControlsEnabled = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
|
|
100
100
|
var defaultMenuHeight = (0, _react.useMemo)(function () {
|
|
101
101
|
return moreElementsInQuickInsertViewEnabled ? DEFAULT_TYPEAHEAD_MENU_HEIGHT_NEW : DEFAULT_TYPEAHEAD_MENU_HEIGHT;
|
|
102
102
|
}, [moreElementsInQuickInsertViewEnabled]);
|
|
@@ -264,7 +264,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
|
|
|
264
264
|
}
|
|
265
265
|
}
|
|
266
266
|
cancel({
|
|
267
|
-
addPrefixTrigger:
|
|
267
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
268
268
|
setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED,
|
|
269
269
|
forceFocusOnEditor: false
|
|
270
270
|
});
|
|
@@ -278,7 +278,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
|
|
|
278
278
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
279
279
|
element === null || element === void 0 || element.removeEventListener('focusout', focusOut);
|
|
280
280
|
};
|
|
281
|
-
}, [ref, cancel, editorView.state,
|
|
281
|
+
}, [ref, cancel, editorView.state, isEditorControlsEnabled, anchorElement]);
|
|
282
282
|
|
|
283
283
|
// TODO: ED-17443 - When you press escape on typeahead panel, it should remove focus and close the panel
|
|
284
284
|
// This is the expected keyboard behaviour advised by the Accessibility team
|
|
@@ -289,7 +289,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
|
|
|
289
289
|
if (event.key === 'Escape') {
|
|
290
290
|
activityStateRef.current.inputMethod = _analytics.INPUT_METHOD.KEYBOARD;
|
|
291
291
|
cancel({
|
|
292
|
-
addPrefixTrigger:
|
|
292
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
293
293
|
setSelectionAt: _constants.CloseSelectionOptions.AFTER_TEXT_INSERTED,
|
|
294
294
|
forceFocusOnEditor: true
|
|
295
295
|
});
|
|
@@ -304,7 +304,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
|
|
|
304
304
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
305
305
|
element === null || element === void 0 || element.removeEventListener('keydown', escape);
|
|
306
306
|
};
|
|
307
|
-
}, [ref, cancel, editorView.state,
|
|
307
|
+
}, [ref, cancel, editorView.state, isEditorControlsEnabled]);
|
|
308
308
|
|
|
309
309
|
// @ts-ignore
|
|
310
310
|
var openElementBrowserModal = triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.openElementBrowserModal;
|
|
@@ -97,7 +97,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
97
97
|
const inputRef = useRef(null);
|
|
98
98
|
const [query, setQuery] = useState(null);
|
|
99
99
|
const isEditorInsertionEnabled = editorExperiment('platform_editor_insertion', 'variant1');
|
|
100
|
-
const
|
|
100
|
+
const isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
|
|
101
101
|
const isSearchPlaceholderEnabled = isEditorInsertionEnabled || editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_quick_insert_placeholder');
|
|
102
102
|
const selection = editorView.state.selection;
|
|
103
103
|
const {
|
|
@@ -141,7 +141,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
141
141
|
cancel({
|
|
142
142
|
forceFocusOnEditor: true,
|
|
143
143
|
text: ' ',
|
|
144
|
-
addPrefixTrigger:
|
|
144
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
145
145
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED
|
|
146
146
|
});
|
|
147
147
|
stopDefault = true;
|
|
@@ -154,7 +154,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
154
154
|
cancel({
|
|
155
155
|
text,
|
|
156
156
|
forceFocusOnEditor: true,
|
|
157
|
-
addPrefixTrigger:
|
|
157
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
158
158
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED
|
|
159
159
|
});
|
|
160
160
|
stopDefault = true;
|
|
@@ -226,7 +226,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
226
226
|
event.preventDefault();
|
|
227
227
|
return false;
|
|
228
228
|
}
|
|
229
|
-
}, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state,
|
|
229
|
+
}, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state, isEditorControlsEnabled]);
|
|
230
230
|
const onClick = useCallback(event => {
|
|
231
231
|
var _inputRef$current;
|
|
232
232
|
event.stopPropagation();
|
|
@@ -261,7 +261,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
261
261
|
}
|
|
262
262
|
cancel({
|
|
263
263
|
forceFocusOnEditor: true,
|
|
264
|
-
addPrefixTrigger:
|
|
264
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
265
265
|
text: cleanedInputContent(),
|
|
266
266
|
setSelectionAt: isMovingRight ? CloseSelectionOptions.AFTER_TEXT_INSERTED : CloseSelectionOptions.BEFORE_TEXT_INSERTED
|
|
267
267
|
});
|
|
@@ -293,7 +293,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
293
293
|
return;
|
|
294
294
|
}
|
|
295
295
|
cancel({
|
|
296
|
-
addPrefixTrigger:
|
|
296
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
297
297
|
text: cleanedInputContent(),
|
|
298
298
|
setSelectionAt: CloseSelectionOptions.BEFORE_TEXT_INSERTED,
|
|
299
299
|
forceFocusOnEditor: false
|
|
@@ -397,7 +397,7 @@ export const InputQuery = /*#__PURE__*/React.memo(({
|
|
|
397
397
|
element.removeEventListener('input', onInput);
|
|
398
398
|
}
|
|
399
399
|
};
|
|
400
|
-
}, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state,
|
|
400
|
+
}, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state, isEditorControlsEnabled]);
|
|
401
401
|
useLayoutEffect(() => {
|
|
402
402
|
const hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
|
|
403
403
|
if (ref.current && forceFocus) {
|
|
@@ -90,7 +90,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
|
|
|
90
90
|
moreElementsInQuickInsertView
|
|
91
91
|
} = useSharedState(api);
|
|
92
92
|
const moreElementsInQuickInsertViewEnabled = moreElementsInQuickInsertView && triggerHandler.id === TypeAheadAvailableNodes.QUICK_INSERT;
|
|
93
|
-
const
|
|
93
|
+
const isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
|
|
94
94
|
const defaultMenuHeight = useMemo(() => moreElementsInQuickInsertViewEnabled ? DEFAULT_TYPEAHEAD_MENU_HEIGHT_NEW : DEFAULT_TYPEAHEAD_MENU_HEIGHT, [moreElementsInQuickInsertViewEnabled]);
|
|
95
95
|
const activityStateRef = useRef({
|
|
96
96
|
inputMethod: null,
|
|
@@ -256,7 +256,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
|
|
|
256
256
|
}
|
|
257
257
|
}
|
|
258
258
|
cancel({
|
|
259
|
-
addPrefixTrigger:
|
|
259
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
260
260
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
|
|
261
261
|
forceFocusOnEditor: false
|
|
262
262
|
});
|
|
@@ -272,7 +272,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
|
|
|
272
272
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
273
273
|
element === null || element === void 0 ? void 0 : element.removeEventListener('focusout', focusOut);
|
|
274
274
|
};
|
|
275
|
-
}, [ref, cancel, editorView.state,
|
|
275
|
+
}, [ref, cancel, editorView.state, isEditorControlsEnabled, anchorElement]);
|
|
276
276
|
|
|
277
277
|
// TODO: ED-17443 - When you press escape on typeahead panel, it should remove focus and close the panel
|
|
278
278
|
// This is the expected keyboard behaviour advised by the Accessibility team
|
|
@@ -284,7 +284,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
|
|
|
284
284
|
if (event.key === 'Escape') {
|
|
285
285
|
activityStateRef.current.inputMethod = INPUT_METHOD.KEYBOARD;
|
|
286
286
|
cancel({
|
|
287
|
-
addPrefixTrigger:
|
|
287
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
288
288
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
|
|
289
289
|
forceFocusOnEditor: true
|
|
290
290
|
});
|
|
@@ -301,7 +301,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
|
|
|
301
301
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
302
302
|
element === null || element === void 0 ? void 0 : element.removeEventListener('keydown', escape);
|
|
303
303
|
};
|
|
304
|
-
}, [ref, cancel, editorView.state,
|
|
304
|
+
}, [ref, cancel, editorView.state, isEditorControlsEnabled]);
|
|
305
305
|
|
|
306
306
|
// @ts-ignore
|
|
307
307
|
const openElementBrowserModal = triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.openElementBrowserModal;
|
|
@@ -100,7 +100,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
100
100
|
query = _useState2[0],
|
|
101
101
|
setQuery = _useState2[1];
|
|
102
102
|
var isEditorInsertionEnabled = editorExperiment('platform_editor_insertion', 'variant1');
|
|
103
|
-
var
|
|
103
|
+
var isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
|
|
104
104
|
var isSearchPlaceholderEnabled = isEditorInsertionEnabled || editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_quick_insert_placeholder');
|
|
105
105
|
var selection = editorView.state.selection;
|
|
106
106
|
var table = editorView.state.schema.nodes.table;
|
|
@@ -147,7 +147,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
147
147
|
cancel({
|
|
148
148
|
forceFocusOnEditor: true,
|
|
149
149
|
text: ' ',
|
|
150
|
-
addPrefixTrigger:
|
|
150
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
151
151
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED
|
|
152
152
|
});
|
|
153
153
|
stopDefault = true;
|
|
@@ -160,7 +160,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
160
160
|
cancel({
|
|
161
161
|
text: text,
|
|
162
162
|
forceFocusOnEditor: true,
|
|
163
|
-
addPrefixTrigger:
|
|
163
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
164
164
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED
|
|
165
165
|
});
|
|
166
166
|
stopDefault = true;
|
|
@@ -232,7 +232,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
232
232
|
event.preventDefault();
|
|
233
233
|
return false;
|
|
234
234
|
}
|
|
235
|
-
}, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state,
|
|
235
|
+
}, [onUndoRedo, onItemSelect, selectNextItem, selectPreviousItem, cancel, cleanedInputContent, editorView.state, isEditorControlsEnabled]);
|
|
236
236
|
var onClick = useCallback(function (event) {
|
|
237
237
|
var _inputRef$current;
|
|
238
238
|
event.stopPropagation();
|
|
@@ -264,7 +264,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
264
264
|
}
|
|
265
265
|
cancel({
|
|
266
266
|
forceFocusOnEditor: true,
|
|
267
|
-
addPrefixTrigger:
|
|
267
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
268
268
|
text: cleanedInputContent(),
|
|
269
269
|
setSelectionAt: isMovingRight ? CloseSelectionOptions.AFTER_TEXT_INSERTED : CloseSelectionOptions.BEFORE_TEXT_INSERTED
|
|
270
270
|
});
|
|
@@ -294,7 +294,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
294
294
|
return;
|
|
295
295
|
}
|
|
296
296
|
cancel({
|
|
297
|
-
addPrefixTrigger:
|
|
297
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
298
298
|
text: cleanedInputContent(),
|
|
299
299
|
setSelectionAt: CloseSelectionOptions.BEFORE_TEXT_INSERTED,
|
|
300
300
|
forceFocusOnEditor: false
|
|
@@ -394,7 +394,7 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
|
|
|
394
394
|
element.removeEventListener('input', onInput);
|
|
395
395
|
}
|
|
396
396
|
};
|
|
397
|
-
}, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state,
|
|
397
|
+
}, [triggerQueryPrefix, cleanedInputContent, onQueryFocus, cancel, checkKeyEvent, editorView.state, isEditorControlsEnabled]);
|
|
398
398
|
useLayoutEffect(function () {
|
|
399
399
|
var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
|
|
400
400
|
if (ref.current && forceFocus) {
|
|
@@ -86,7 +86,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
|
|
|
86
86
|
var _useSharedState = useSharedState(api),
|
|
87
87
|
moreElementsInQuickInsertView = _useSharedState.moreElementsInQuickInsertView;
|
|
88
88
|
var moreElementsInQuickInsertViewEnabled = moreElementsInQuickInsertView && triggerHandler.id === TypeAheadAvailableNodes.QUICK_INSERT;
|
|
89
|
-
var
|
|
89
|
+
var isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
|
|
90
90
|
var defaultMenuHeight = useMemo(function () {
|
|
91
91
|
return moreElementsInQuickInsertViewEnabled ? DEFAULT_TYPEAHEAD_MENU_HEIGHT_NEW : DEFAULT_TYPEAHEAD_MENU_HEIGHT;
|
|
92
92
|
}, [moreElementsInQuickInsertViewEnabled]);
|
|
@@ -254,7 +254,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
|
|
|
254
254
|
}
|
|
255
255
|
}
|
|
256
256
|
cancel({
|
|
257
|
-
addPrefixTrigger:
|
|
257
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
258
258
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
|
|
259
259
|
forceFocusOnEditor: false
|
|
260
260
|
});
|
|
@@ -268,7 +268,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
|
|
|
268
268
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
269
269
|
element === null || element === void 0 || element.removeEventListener('focusout', focusOut);
|
|
270
270
|
};
|
|
271
|
-
}, [ref, cancel, editorView.state,
|
|
271
|
+
}, [ref, cancel, editorView.state, isEditorControlsEnabled, anchorElement]);
|
|
272
272
|
|
|
273
273
|
// TODO: ED-17443 - When you press escape on typeahead panel, it should remove focus and close the panel
|
|
274
274
|
// This is the expected keyboard behaviour advised by the Accessibility team
|
|
@@ -279,7 +279,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
|
|
|
279
279
|
if (event.key === 'Escape') {
|
|
280
280
|
activityStateRef.current.inputMethod = INPUT_METHOD.KEYBOARD;
|
|
281
281
|
cancel({
|
|
282
|
-
addPrefixTrigger:
|
|
282
|
+
addPrefixTrigger: isEditorControlsEnabled ? !removePrefixTriggerOnCancel : true,
|
|
283
283
|
setSelectionAt: CloseSelectionOptions.AFTER_TEXT_INSERTED,
|
|
284
284
|
forceFocusOnEditor: true
|
|
285
285
|
});
|
|
@@ -294,7 +294,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
|
|
|
294
294
|
// eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
|
|
295
295
|
element === null || element === void 0 || element.removeEventListener('keydown', escape);
|
|
296
296
|
};
|
|
297
|
-
}, [ref, cancel, editorView.state,
|
|
297
|
+
}, [ref, cancel, editorView.state, isEditorControlsEnabled]);
|
|
298
298
|
|
|
299
299
|
// @ts-ignore
|
|
300
300
|
var openElementBrowserModal = triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.openElementBrowserModal;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-type-ahead",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.18",
|
|
4
4
|
"description": "Type-ahead plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@atlaskit/adf-schema": "^47.6.0",
|
|
37
|
-
"@atlaskit/editor-common": "^
|
|
37
|
+
"@atlaskit/editor-common": "^107.0.0",
|
|
38
38
|
"@atlaskit/editor-element-browser": "^0.1.0",
|
|
39
39
|
"@atlaskit/editor-plugin-analytics": "^2.3.0",
|
|
40
40
|
"@atlaskit/editor-plugin-connectivity": "^2.0.0",
|
|
@@ -46,11 +46,11 @@
|
|
|
46
46
|
"@atlaskit/icon": "^27.0.0",
|
|
47
47
|
"@atlaskit/menu": "^8.0.0",
|
|
48
48
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
49
|
-
"@atlaskit/primitives": "^14.
|
|
49
|
+
"@atlaskit/primitives": "^14.9.0",
|
|
50
50
|
"@atlaskit/prosemirror-input-rules": "^3.3.0",
|
|
51
51
|
"@atlaskit/theme": "^18.0.0",
|
|
52
|
-
"@atlaskit/tmp-editor-statsig": "^7.
|
|
53
|
-
"@atlaskit/tokens": "^5.
|
|
52
|
+
"@atlaskit/tmp-editor-statsig": "^7.2.0",
|
|
53
|
+
"@atlaskit/tokens": "^5.3.0",
|
|
54
54
|
"@babel/runtime": "^7.0.0",
|
|
55
55
|
"@emotion/react": "^11.7.1",
|
|
56
56
|
"lodash": "^4.17.21",
|
|
@@ -102,9 +102,6 @@
|
|
|
102
102
|
"platform_editor_typeahead_dynamic_height_fix": {
|
|
103
103
|
"type": "boolean"
|
|
104
104
|
},
|
|
105
|
-
"platform_editor_controls_patch_2": {
|
|
106
|
-
"type": "boolean"
|
|
107
|
-
},
|
|
108
105
|
"platform_editor_quick_insert_placeholder": {
|
|
109
106
|
"type": "boolean"
|
|
110
107
|
},
|