jodit 3.18.8 → 3.19.2

package/src/plugins/{clipboard/paste-from-word → paste-from-word}/paste-from-word.ts

@@ -7,15 +7,10 @@
 /**
  * [[include:plugins/clipboard/paste-from-word/README.md]]
  * @packageDocumentation
- * @module plugins/clipboard/paste-from-word
+ * @module plugins/paste-from-word
  */
 
-import type { IJodit } from 'jodit/types';
-import type {
-	PasteEvent,
-	InsertMode
-} from 'jodit/plugins/clipboard/paste/interface';
-
+import type { IJodit, InsertMode } from 'jodit/types';
 import { Plugin } from 'jodit/core/plugin';
 import {
 	applyStyles,
@@ -29,16 +24,20 @@ import {
 	INSERT_AS_TEXT,
 	INSERT_ONLY_TEXT
 } from 'jodit/core/constants';
+import { watch } from 'jodit/core/decorators';
+
+import type { PastedData, PasteEvent } from 'jodit/plugins/paste/interface';
 import {
 	askInsertTypeDialog,
 	pasteInsertHtml
-} from 'jodit/plugins/clipboard/paste/helpers';
-import type { PastedData } from 'jodit/plugins/clipboard/paste/interface';
-import { watch } from 'jodit/src/core/decorators';
+} from 'jodit/plugins/paste/helpers';
+import { pluginSystem } from 'jodit/core/global';
 
 import './config';
 
-export class PasteFromWord extends Plugin {
+export class pasteFromWord extends Plugin {
+	override requires = ['paste'];
+
 	protected override afterInit(jodit: IJodit): void {}
 	protected override beforeDestruct(jodit: IJodit): void {}
 
@@ -100,12 +99,10 @@ export class PasteFromWord extends Plugin {
 			case INSERT_AS_HTML: {
 				html = applyStyles(html);
 
-				if (this.j.o.beautifyHTML) {
-					const value = this.j.events?.fire('beautifyHTML', html);
+				const value = this.j.events?.fire('beautifyHTML', html);
 
-					if (isString(value)) {
-						html = value;
-					}
+				if (isString(value)) {
+					html = value;
 				}
 
 				break;
@@ -125,3 +122,5 @@ export class PasteFromWord extends Plugin {
 		pasteInsertHtml(e, this.j, html);
 	}
 }
+
+pluginSystem.add('pasteFromWord', pasteFromWord);

package/src/plugins/{clipboard/paste-storage → paste-storage}/paste-storage.less

@@ -4,7 +4,7 @@
  * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-@import (reference) '../../../styles/variables';
+@import (reference) '../../styles/variables';
 
 .jodit-paste-storage {
 	max-width: 600px;

package/src/plugins/paste-storage/paste-storage.test.js

@@ -0,0 +1,231 @@
+/*!
+ * Jodit Editor (https://xdsoft.net/jodit/)
+ * Released under MIT see LICENSE.txt in the project root for license information.
+ * Copyright (c) 2013-2022 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
+ */
+
+describe('Paste storage', function () {
+	describe('Empty list', function () {
+		it('Sholud not show dialog', function () {
+			const editor = getJodit();
+
+			simulateEvent('keydown', 'v', editor.editor, function (data) {
+				data.ctrlKey = true;
+				data.shiftKey = true;
+			});
+
+			const dialog = getOpenedDialog(editor);
+			expect(dialog).is.null;
+		});
+	});
+
+	describe('After copy elements', function () {
+		it('Sholud show dialog with pasted list', function () {
+			const editor = getJodit({
+				observer: {
+					timeout: 0
+				}
+			});
+
+			editor.s.focus();
+			editor.value = 'abcde';
+			const range = editor.ownerDocument.createRange();
+
+			range.setStart(editor.editor.firstChild, 0);
+			range.setEnd(editor.editor.firstChild, 1);
+			editor.s.selectRange(range);
+
+			simulateEvent('copy', 0, editor.editor, function (data) {
+				Object.defineProperty(data, 'clipboardData', {
+					value: {
+						getData: function () {},
+						setData: function () {}
+					}
+				});
+			});
+
+			range.setStart(editor.editor.firstChild.firstChild, 1);
+			range.setEnd(editor.editor.firstChild.firstChild, 2);
+			editor.s.selectRange(range);
+
+			simulateEvent('copy', 0, editor.editor, function (data) {
+				Object.defineProperty(data, 'clipboardData', {
+					value: {
+						getData: function () {},
+						setData: function () {}
+					}
+				});
+			});
+
+			simulateEvent('keydown', 'v', editor.editor, function (data) {
+				data.ctrlKey = true;
+				data.shiftKey = true;
+			});
+
+			const dialog = getOpenedDialog(editor);
+			expect(dialog).is.not.null;
+		});
+
+		describe('After click on some of elements', function () {
+			it('Sholud select this', function () {
+				const editor = getJodit();
+
+				editor.value = 'abcde';
+				const range = editor.ownerDocument.createRange();
+
+				range.setStart(editor.editor.firstChild.firstChild, 0);
+				range.setEnd(editor.editor.firstChild.firstChild, 1);
+				editor.s.selectRange(range);
+
+				simulateEvent('copy', 0, editor.editor, function (data) {
+					Object.defineProperty(data, 'clipboardData', {
+						value: {
+							getData: function () {},
+							setData: function () {}
+						}
+					});
+				});
+
+				range.setStart(editor.editor.firstChild.firstChild, 1);
+				range.setEnd(editor.editor.firstChild.firstChild, 2);
+				editor.s.selectRange(range);
+
+				simulateEvent('copy', 0, editor.editor, function (data) {
+					Object.defineProperty(data, 'clipboardData', {
+						value: {
+							getData: function () {},
+							setData: function () {}
+						}
+					});
+				});
+
+				simulateEvent('keydown', 'v', editor.editor, function (data) {
+					data.ctrlKey = true;
+					data.shiftKey = true;
+				});
+
+				const dialog = getOpenedDialog(editor);
+				expect(dialog).is.not.null;
+
+				simulateEvent(
+					'click',
+					0,
+					dialog.querySelectorAll('.jodit-paste-storage a')[1]
+				);
+
+				expect(
+					dialog
+						.querySelectorAll('.jodit-paste-storage a')[1]
+						.classList.contains('jodit_active')
+				).is.true;
+
+				simulateEvent(
+					'dblclick',
+					0,
+					dialog.querySelectorAll('.jodit-paste-storage a')[1]
+				);
+
+				expect(dialog.parentNode).is.null;
+
+				expect(editor.value).equals('<p>aacde</p>');
+			});
+		});
+
+		describe('Press key up/down/enter', function () {
+			it('Sholud select next/previos element of list and insert selected value after Enter', function () {
+				const editor = getJodit();
+
+				editor.value = 'abcde';
+				const range = editor.ownerDocument.createRange();
+
+				range.setStart(editor.editor.firstChild.firstChild, 0);
+				range.setEnd(editor.editor.firstChild.firstChild, 1);
+				editor.s.selectRange(range);
+
+				simulateEvent('copy', 0, editor.editor, function (data) {
+					Object.defineProperty(data, 'clipboardData', {
+						value: {
+							getData: function () {},
+							setData: function () {}
+						}
+					});
+				});
+
+				range.setStart(editor.editor.firstChild.firstChild, 1);
+				range.setEnd(editor.editor.firstChild.firstChild, 2);
+				editor.s.selectRange(range);
+
+				simulateEvent('copy', 0, editor.editor, function (data) {
+					Object.defineProperty(data, 'clipboardData', {
+						value: {
+							getData: function () {},
+							setData: function () {}
+						}
+					});
+				});
+
+				simulateEvent('keydown', 'v', editor.editor, function (data) {
+					data.ctrlKey = true;
+					data.shiftKey = true;
+				});
+
+				const dialog = getOpenedDialog(editor);
+				expect(dialog).is.not.null;
+
+				simulateEvent(
+					'click',
+					0,
+					dialog.querySelectorAll('.jodit-paste-storage a')[0]
+				);
+				expect(
+					dialog
+						.querySelectorAll('.jodit-paste-storage a')[0]
+						.classList.contains('jodit_active')
+				).is.true;
+
+				simulateEvent(
+					'keydown',
+					Jodit.KEY_UP,
+					dialog.querySelectorAll('.jodit-paste-storage a')[0]
+				);
+				expect(
+					dialog
+						.querySelectorAll('.jodit-paste-storage a')[1]
+						.classList.contains('jodit_active')
+				).is.true;
+
+				simulateEvent(
+					'keydown',
+					Jodit.KEY_UP,
+					dialog.querySelectorAll('.jodit-paste-storage a')[1]
+				);
+				expect(
+					dialog
+						.querySelectorAll('.jodit-paste-storage a')[0]
+						.classList.contains('jodit_active')
+				).is.true;
+
+				simulateEvent(
+					'keydown',
+					Jodit.KEY_DOWN,
+					dialog.querySelectorAll('.jodit-paste-storage a')[0]
+				);
+				expect(
+					dialog
+						.querySelectorAll('.jodit-paste-storage a')[1]
+						.classList.contains('jodit_active')
+				).is.true;
+
+				simulateEvent(
+					'keydown',
+					Jodit.KEY_ENTER,
+					dialog.querySelectorAll('.jodit-paste-storage a')[0]
+				);
+
+				expect(dialog.parentNode).is.null;
+
+				expect(editor.value).equals('<p>aacde</p>');
+			});
+		});
+	});
+});

package/src/plugins/{clipboard/paste-storage → paste-storage}/paste-storage.ts

@@ -5,7 +5,7 @@
  */
 
 /**
- * @module plugins/clipboard/paste-storage
+ * @module plugins/paste-storage
  */
 
 import './paste-storage.less';
@@ -16,11 +16,12 @@ import {
 	KEY_UP,
 	SPACE_REG_EXP
 } from 'jodit/core/constants';
-import { Dialog } from 'jodit/modules/dialog';
-import { Plugin } from 'jodit/core/plugin';
-import { Dom } from 'jodit/core/dom';
+import { Dialog } from 'jodit/modules/dialog/dialog';
+import { Plugin } from 'jodit/core/plugin/plugin';
+import { Dom } from 'jodit/core/dom/dom';
 import { attr, toArray } from 'jodit/core/helpers';
-import { Button } from 'jodit/core/ui';
+import { Button } from 'jodit/core/ui/button/button/button';
+import { pluginSystem } from 'jodit/core/global';
 
 /**
  * Show dialog choose content to paste
@@ -217,3 +218,5 @@ export class pasteStorage extends Plugin {
 		this.list = [];
 	}
 }
+
+pluginSystem.add('pasteStorage', pasteStorage);

package/src/plugins/placeholder/placeholder.ts

@@ -14,10 +14,11 @@ import type { IJodit } from 'jodit/types';
 import * as consts from 'jodit/core/constants';
 import { css, attr } from 'jodit/core/helpers';
 import { Dom } from 'jodit/core/dom';
-import { Plugin } from 'jodit/core/plugin';
+import { Plugin } from 'jodit/core/plugin/plugin';
 import { MAY_BE_REMOVED_WITH_KEY } from 'jodit/core/constants';
 import { debounce } from 'jodit/core/decorators';
 import { Select } from 'jodit/core/selection';
+import { pluginSystem } from 'jodit/core/global';
 
 import './config';
 
@@ -216,3 +217,5 @@ export class placeholder extends Plugin {
 		jodit.e.off('.placeholder').off(window, 'load', this.toggle);
 	}
 }
+
+pluginSystem.add('placeholder', placeholder);