@syncfusion/ej2-richtexteditor 23.2.7-52849 → 24.1.41-569421

package/src/rich-text-editor/renderer/video-module.js

@@ -13,6 +13,7 @@ var Video = /** @class */ (function () {
         this.isAllowedTypes = true;
         this.pageX = null;
         this.pageY = null;
+        this.mouseX = null;
         this.deletedVid = [];
         this.parent = parent;
         this.rteID = parent.element.id;
@@ -143,7 +144,7 @@ var Video = /** @class */ (function () {
             var dialogContent = this.vidsizeInput(e);
             var selectObj_1 = { args: e.args, selfVideo: this, selection: e.selection, selectNode: e.selectNode };
             this.dialogObj.setProperties({
-                height: 'inherit', width: '290px', header: vidSizeHeader, content: dialogContent,
+                width: '290px', header: vidSizeHeader, content: dialogContent,
                 buttons: [{
                         // eslint-disable-next-line
                         click: function (e) {
@@ -412,62 +413,50 @@ var Video = /** @class */ (function () {
         if (isNullOrUndefined(vidEleStyle)) {
             return;
         }
-        // eslint-disable-next-line
+        /* eslint-disable */
         var width = vidEleStyle.width !== '' ? vidEleStyle.width.match(/^\d+(\.\d*)?%$/g) ? parseFloat(vidEleStyle.width) :
             parseInt(vidEleStyle.width, 10) : vid.style.width !== '' ? vid.style.width : vid.width;
         var height = vidEleStyle.height !== '' ? parseInt(vidEleStyle.height, 10) : vid.style.height !== '' ? vid.style.height : vid.height;
+        width = width.toString().match(/\b\d+(\.\d*)?(%|$)\b/g) ? parseFloat(width.toString()) : parseInt(width.toString(), 10);
+        height = height.toString().match(/\b\d+(\.\d*)?(%|$)\b/g) ? parseFloat(height.toString()) : parseInt(height.toString(), 10);
+        /* eslint-enable */
         if (width > height) {
             vid.style.minWidth = this.parent.insertVideoSettings.minWidth === 0 ? '200px' : formatUnit(this.parent.insertVideoSettings.minWidth);
             vid.style.minHeight = this.parent.insertVideoSettings.minHeight === 0 ? '90px' : formatUnit(this.parent.insertVideoSettings.minHeight);
             if (this.parent.insertVideoSettings.resizeByPercent) {
-                if (parseInt('' + vid.getBoundingClientRect().width + '', 10) !== 0 && parseInt('' + width + '', 10) !== 0) {
-                    var percentageValue = this.pixToPerc((parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY), (vid.previousElementSibling || vid.parentElement));
-                    vid.style.width = Math.min(Math.round((percentageValue / vid.getBoundingClientRect().width) * expectedX * 100) / 100, 100) + '%';
-                }
-                else {
-                    vid.style.width = this.pixToPerc(parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY, (vid.previousElementSibling || vid.parentElement)) + '%';
-                }
-                vid.style.height = null;
-                vid.removeAttribute('height');
+                this.updateVidEleWidth(vid, width, height, expectedX, expectedY);
             }
             else if ((vid.style.width === '' && vid.style.height !== '') || (vidEleStyle.width === '' && vidEleStyle.height !== '')) {
                 vid.style.height = expectedY + 'px';
             }
             else if ((vid.style.width !== '' && vid.style.height === '') || (vidEleStyle.width !== '' && vidEleStyle.height === '')) {
-                var currentWidth = ((parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY) +
-                    parseInt(width.toString(), 10) / parseInt(height.toString(), 10)) <
+                var currentWidth = ((width / height * expectedY) +
+                    width / height) <
                     (this.parent.inputElement.getBoundingClientRect().right - 32) ?
-                    ((parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY) +
-                        parseInt(width.toString(), 10) / parseInt(height.toString(), 10)) :
+                    ((width / height * expectedY) +
+                        width / height) :
                     (this.parent.inputElement.getBoundingClientRect().right - 32);
                 vid.style.width = currentWidth.toString() + 'px';
             }
             else if (vid.style.width !== '' || vidEleStyle.width !== '') {
-                var currentWidth = (parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY) <
+                var currentWidth = (width / height * expectedY) <
                     (this.parent.inputElement.getBoundingClientRect().right - 32) ?
-                    (parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY) :
+                    (width / height * expectedY) :
                     (this.parent.inputElement.getBoundingClientRect().right - 32);
                 vid.style.width = currentWidth + 'px';
                 vid.style.height = expectedY + 'px';
             }
             else {
-                vid.setAttribute('width', (parseInt(((parseInt(width.toString(), 10) / parseInt(height.toString(), 10) * expectedY) + parseInt(width.toString(), 10) / parseInt(height.toString(), 10)).toString(), 10)).toString());
+                vid.setAttribute('width', (parseInt(((width / height * expectedY) + width / height).toString(), 10)).toString());
             }
         }
         else if (height > width) {
             if (this.parent.insertVideoSettings.resizeByPercent) {
-                if (parseInt('' + vid.getBoundingClientRect().width + '', 10) !== 0 && parseInt('' + width + '', 10) !== 0) {
-                    vid.style.width = Math.min(Math.round((parseInt(width.toString(), 10) / vid.getBoundingClientRect().width) * expectedX * 100) / 100, 100) + '%';
-                }
-                else {
-                    vid.style.width = this.pixToPerc((expectedX / parseInt(height.toString(), 10) * expectedY), (vid.previousElementSibling || vid.parentElement)) + '%';
-                }
-                vid.style.height = null;
-                vid.removeAttribute('height');
+                this.updateVidEleWidth(vid, width, height, expectedX, expectedY);
             }
             else if (vid.style.width !== '' || vidEleStyle.width !== '') {
                 vid.style.width = expectedX + 'px';
-                vid.style.height = (parseInt(height.toString(), 10) / parseInt(width.toString(), 10) * expectedX) + 'px';
+                vid.style.height = (height / width * expectedX) + 'px';
             }
             else {
                 vid.setAttribute('width', this.resizeBtnStat.botRight ? (this.getPointX(e.event) - vid.getBoundingClientRect().left).toString() : expectedX.toString());
@@ -485,6 +474,23 @@ var Video = /** @class */ (function () {
             }
         }
     };
+    Video.prototype.updateVidEleWidth = function (vid, width, height, expectedX, expectedY) {
+        if (parseInt('' + vid.getBoundingClientRect().width + '', 10) !== 0 && parseInt('' + width + '', 10) !== 0) {
+            var original = vid.offsetWidth + this.mouseX;
+            var finalWidthByPerc = (original / vid.offsetWidth) * (parseFloat(vid.style.width).toString() === 'NaN' ? (vid.offsetWidth / (parseFloat(getComputedStyle(this.parent.element).width)) * 100) : parseFloat(vid.style.width));
+            vid.style.width = ((finalWidthByPerc > 3) ? finalWidthByPerc : 3) + '%';
+        }
+        else {
+            if (width > height) {
+                vid.style.width = this.pixToPerc(width / height * expectedY, (vid.previousElementSibling || vid.parentElement)) + '%';
+            }
+            else {
+                vid.style.width = this.pixToPerc((expectedX / height * expectedY), (vid.previousElementSibling || vid.parentElement)) + '%';
+            }
+        }
+        vid.style.height = null;
+        vid.removeAttribute('height');
+    };
     Video.prototype.pixToPerc = function (expected, parentEle) {
         return expected / parseFloat(getComputedStyle(parentEle).width) * 100;
     };
@@ -510,7 +516,6 @@ var Video = /** @class */ (function () {
                 _this.setAspectRatio(_this.videoEle, parseInt(width, 10), parseInt(height, 10), args);
                 _this.resizeVidDupPos(_this.videoEle);
                 _this.vidResizePos(_this.videoEle, _this.vidResizeDiv);
-                _this.parent.setContentHeight('', false);
             }
         });
     };
@@ -526,6 +531,7 @@ var Video = /** @class */ (function () {
         var height = parseInt(this.vidDupPos.height, 10) + mouseY;
         this.pageX = pageX;
         this.pageY = pageY;
+        this.mouseX = mouseX;
         if (this.resizeBtnStat.botRight) {
             this.vidDupMouseMove(width + 'px', height + 'px', e);
         }
@@ -692,6 +698,14 @@ var Video = /** @class */ (function () {
                 originalEvent.preventDefault();
                 break;
         }
+        if (originalEvent.ctrlKey && originalEvent.key === 'a') {
+            this.handleSelectAll();
+        }
+    };
+    Video.prototype.handleSelectAll = function () {
+        this.cancelResizeAction();
+        var videoFocusNodes = this.parent.inputElement.querySelectorAll('.' + classes.CLS_VID_FOCUS);
+        removeClass(videoFocusNodes, classes.CLS_VID_FOCUS);
     };
     Video.prototype.openDialog = function (isInternal, event, selection, ele, parentEle) {
         var range;
@@ -803,7 +817,7 @@ var Video = /** @class */ (function () {
             this.parent.formatter.saveData();
         }
         e.selection.restore();
-        this.parent.formatter.process(this.parent, e.args, e.args, {
+        this.parent.formatter.process(this.parent, e.args, e.args.originalEvent, {
             selectNode: e.selectNode,
             subCommand: e.args.item.subCommand
         });
@@ -869,6 +883,7 @@ var Video = /** @class */ (function () {
             if (e.offsetX > e.target.clientWidth || e.offsetY > e.target.clientHeight) {
             }
             else {
+                this.parent.notify(events.documentClickClosedBy, { closedBy: "outside click" });
                 this.dialogObj.hide({ returnValue: true });
                 this.parent.isBlur = true;
                 dispatchEvent(this.parent.element, 'focusout');
@@ -892,6 +907,9 @@ var Video = /** @class */ (function () {
                 this.prevSelectedVidEle.style.outline = '';
             }
         }
+        if (this.parent.inlineMode.enable && target && this.dialogObj && !closest(target, '#' + this.dialogObj.element.id)) {
+            this.dialogObj.hide();
+        }
     };
     Video.prototype.removeResizeEle = function () {
         EventHandler.remove(this.contentModule.getDocument(), Browser.touchMoveEvent, this.resizing);
@@ -909,7 +927,7 @@ var Video = /** @class */ (function () {
         }
         var subCommand = (e.args.item) ?
             e.args.item.subCommand : 'Break';
-        this.parent.formatter.process(this.parent, e.args, e.args, { selectNode: e.selectNode, subCommand: subCommand });
+        this.parent.formatter.process(this.parent, e.args, e.args.originalEvent, { selectNode: e.selectNode, subCommand: subCommand });
     };
     Video.prototype.inline = function (e) {
         if (e.selectNode[0].nodeName !== 'VIDEO' && !this.isEmbedVidElem(e.selectNode[0])) {
@@ -917,12 +935,12 @@ var Video = /** @class */ (function () {
         }
         var subCommand = (e.args.item) ?
             e.args.item.subCommand : 'Inline';
-        this.parent.formatter.process(this.parent, e.args, e.args, { selectNode: e.selectNode, subCommand: subCommand });
+        this.parent.formatter.process(this.parent, e.args, e.args.originalEvent, { selectNode: e.selectNode, subCommand: subCommand });
     };
     Video.prototype.alignVideo = function (e, type) {
         var subCommand = (e.args.item) ?
             e.args.item.subCommand : type;
-        this.parent.formatter.process(this.parent, e.args, e.args, { selectNode: e.selectNode, subCommand: subCommand });
+        this.parent.formatter.process(this.parent, e.args, e.args.originalEvent, { selectNode: e.selectNode, subCommand: subCommand });
     };
     Video.prototype.editAreaClickHandler = function (e) {
         if (this.parent.readonly) {
@@ -1066,7 +1084,7 @@ var Video = /** @class */ (function () {
                     _this.uploadObj.removing();
                 }
                 _this.parent.isBlur = false;
-                if (event && event.event.returnValue) {
+                if (event && !isNOU(event.event) && event.event.returnValue) {
                     if (_this.parent.editorMode === 'HTML') {
                         selection.restore();
                     }
@@ -1158,26 +1176,44 @@ var Video = /** @class */ (function () {
                 }
             }
         });
+        if (e.selectNode && e.selectNode[0] && (e.selectNode[0].nodeName === 'VIDEO' || this.isEmbedVidElem(e.selectNode[0]))) {
+            if (e.selectNode[0].nodeName === 'VIDEO') {
+                var regex = new RegExp(/([^\S]|^)(((https?\:\/\/)|(www\.))(\S+))/gi);
+                var sourceElement = e.selectNode[0].querySelector('source');
+                this.inputUrl.value = sourceElement && sourceElement.src && sourceElement.src.match(regex) ? sourceElement.src : '';
+            }
+            else {
+                this.embedInputUrl.value = e.selectNode[0].nodeName === 'IFRAME' ? e.selectNode[0].outerHTML
+                    : e.selectNode[0].querySelector('iframe').outerHTML;
+            }
+        }
+        var isWebUrl = this.inputUrl.value ? true : false;
         var embedUrlBtn = new RadioButton({
             label: this.i10n.getConstant('embeddedCode'),
-            checked: true,
+            checked: !isWebUrl,
             name: 'URL',
             created: function () {
-                urlContent.appendChild(_this.embedInputUrl);
+                if (!isWebUrl) {
+                    urlContent.appendChild(_this.embedInputUrl);
+                }
             },
             change: function () {
                 urlContent.innerHTML = '';
-                _this.inputUrl.value = '';
                 urlContent.appendChild(_this.embedInputUrl);
             }
         });
         embedUrlBtn.appendTo(videoUrl.querySelector('#embedURL'));
         var webUrlBtn = new RadioButton({
             label: this.i10n.getConstant('webUrl'),
+            checked: isWebUrl,
             name: 'URL',
+            created: function () {
+                if (isWebUrl) {
+                    urlContent.appendChild(_this.inputUrl);
+                }
+            },
             change: function () {
                 urlContent.innerHTML = '';
-                _this.embedInputUrl.value = '';
                 urlContent.appendChild(_this.inputUrl);
             }
         });
@@ -1307,8 +1343,12 @@ var Video = /** @class */ (function () {
                 _this.parent.trigger(events.fileRemoving, e, function (e) {
                     proxy.isVideoUploaded = false;
                     _this.dialogObj.getButtons(0).element.disabled = true;
-                    //proxy.inputUrl.removeAttribute('disabled');
-                    proxy.embedInputUrl.removeAttribute('disabled');
+                    if (proxy.inputUrl.getAttribute('disabled')) {
+                        proxy.inputUrl.removeAttribute('disabled');
+                    }
+                    if (proxy.embedInputUrl.getAttribute('disabled')) {
+                        proxy.embedInputUrl.removeAttribute('disabled');
+                    }
                     if (proxy.uploadUrl) {
                         proxy.uploadUrl.url = '';
                     }
@@ -1369,10 +1409,11 @@ var Video = /** @class */ (function () {
                 this.selection = proxy.parent.formatter.editorManager.nodeSelection.save(range, proxy.contentModule.getDocument());
                 this.selectParent = proxy.parent.formatter.editorManager.nodeSelection.getParentNodeCollection(range);
             }
-            var name_1 = url !== '' ? url.split('/')[url.split('/').length - 1] : embedUrl;
+            var webUrlBtn = document.getElementById('webURL');
+            var name_1 = webUrlBtn.checked ? url.split('/')[url.split('/').length - 1] : embedUrl;
             var value = {
                 cssClass: (proxy.parent.insertVideoSettings.layoutOption === 'Inline' ? classes.CLS_VIDEOINLINE : classes.CLS_VIDEOBREAK),
-                url: url, selection: this.selection, fileName: name_1, isEmbedUrl: embedUrl !== '' ? true : false,
+                url: url, selection: this.selection, fileName: name_1, isEmbedUrl: !webUrlBtn.checked,
                 selectParent: this.selectParent, width: {
                     width: proxy.parent.insertVideoSettings.width, minWidth: proxy.parent.insertVideoSettings.minWidth,
                     maxWidth: proxy.parent.getInsertImgMaxWidth()

package/src/rich-text-editor/renderer/view-source.d.ts

@@ -15,6 +15,7 @@ export declare class ViewSource {
     private rendererFactory;
     private keyboardModule;
     private previewElement;
+    private codeViewTimeInterval;
     /**
      * Constructor for view source module
      *

package/src/rich-text-editor/renderer/view-source.js

@@ -44,7 +44,7 @@ var ViewSource = /** @class */ (function () {
         this.parent.formatter.editorManager.observer.off(CONSTANT.KEY_DOWN_HANDLER, this.onKeyDown);
     };
     ViewSource.prototype.getSourceCode = function () {
-        return this.parent.createElement('textarea', { className: CLS_RTE_SOURCE_CODE_TXTAREA + ' ' + this.parent.cssClass });
+        return this.parent.createElement('textarea', { className: CLS_RTE_SOURCE_CODE_TXTAREA + this.parent.getCssClass(true) });
     };
     ViewSource.prototype.wireEvent = function (element) {
         this.keyboardModule = new KeyboardEvents(element, {
@@ -108,6 +108,7 @@ var ViewSource = /** @class */ (function () {
      * @deprecated
      */
     ViewSource.prototype.sourceCode = function (args) {
+        var _this = this;
         this.parent.notify(events.hidePopup, {});
         this.parent.isBlur = false;
         this.parent.trigger(events.actionBegin, { requestType: 'SourceCode', targetItem: 'SourceCode', args: args });
@@ -134,15 +135,16 @@ var ViewSource = /** @class */ (function () {
             rteContent.appendChild(this.previewElement);
             this.parent.element.appendChild(rteContent);
             rteContent.style.height = this.contentModule.getPanel().style.height;
-            rteContent.style.marginTop = this.contentModule.getPanel().style.marginTop;
             this.getPanel().value = this.getTextAreaValue();
             this.contentModule.getPanel().style.display = 'none';
             rteContent.style.display = 'block';
             this.getPanel().style.display = 'block';
         }
         else {
+            var height = this.parent.inputElement.offsetHeight;
             this.contentModule.getPanel().appendChild(this.previewElement);
             this.getPanel().value = this.getTextAreaValue();
+            this.previewElement.style.height = height + 'px';
             this.contentModule.getEditPanel().style.display = 'none';
             this.previewElement.style.display = 'block';
         }
@@ -153,17 +155,23 @@ var ViewSource = /** @class */ (function () {
             removeClass([this.parent.getToolbar()], [CLS_EXPAND_OPEN]);
         }
         removeClass(tbItems, [CLS_ACTIVE]);
-        this.parent.setContentHeight('sourceCode', true);
+        var isExpand = this.parent.element.querySelectorAll('.e-toolbar-extended.e-popup-open').length > 0 ? true : false;
+        this.parent.setContentHeight('SourceCode', isExpand);
         this.wireEvent(this.previewElement);
         this.unWireBaseKeyDown();
         this.previewElement.focus();
         this.parent.updateValue();
         if (!isNullOrUndefined(this.parent.placeholder) && !this.parent.iframeSettings.enable) {
             var placeHolderWrapper = this.parent.element.querySelector('.rte-placeholder.e-rte-placeholder');
-            placeHolderWrapper.style.display = 'none';
+            if (placeHolderWrapper) {
+                placeHolderWrapper.style.display = 'none';
+            }
         }
         this.parent.trigger(events.actionComplete, { requestType: 'SourceCode', targetItem: 'SourceCode', args: args });
         this.parent.invokeChangeEvent();
+        if (!isNullOrUndefined(this.parent.saveInterval) && this.parent.saveInterval > 0 && this.parent.autoSaveOnIdle) {
+            this.codeViewTimeInterval = setInterval(function () { _this.parent.notify(events.updateValueOnIdle, {}); }, this.parent.saveInterval);
+        }
     };
     /**
      * updateSourceCode method
@@ -213,7 +221,8 @@ var ViewSource = /** @class */ (function () {
         if (this.parent.getToolbar()) {
             removeClass([this.parent.getToolbar()], [CLS_EXPAND_OPEN]);
         }
-        this.parent.setContentHeight('preview', true);
+        var isExpand = this.parent.element.querySelectorAll('.e-toolbar-extended.e-popup-open').length > 0 ? true : false;
+        this.parent.setContentHeight('Preview', isExpand);
         this.unWireEvent();
         this.wireBaseKeyDown();
         this.contentModule.getEditPanel().focus();
@@ -225,6 +234,7 @@ var ViewSource = /** @class */ (function () {
         this.parent.trigger(events.actionComplete, { requestType: 'Preview', targetItem: 'Preview', args: args });
         this.parent.formatter.enableUndo(this.parent);
         this.parent.addAudioVideoWrapper();
+        clearTimeout(this.codeViewTimeInterval);
         this.parent.invokeChangeEvent();
         this.parent.notify(events.tableclass, {});
     };

package/src/selection/selection.js

@@ -90,6 +90,9 @@ var NodeSelection = /** @class */ (function () {
                 || this.isChildNode(nodeCollection, startNode))) {
             return null;
         }
+        if (startNode.nodeType === 3 && startNode.previousSibling === endNode && endNode.nodeName === 'IMG') {
+            return null;
+        }
         if (nodeCollection.indexOf(startNode.firstChild) === -1 && startNode.firstChild && !this.isChildNode(nodeCollection, startNode)) {
             return startNode.firstChild;
         }