@worktile/theia 2.3.0-next.0 → 2.3.0-next.1

package/bundles/worktile-theia.umd.js

@@ -8765,7 +8765,7 @@
 
     /** Converts CSS pixel values to numbers, eg "123px" to 123. Returns NaN for non pixel values. */
     function coercePixelsFromCssValue(cssValue) {
-        var match = cssValue.match(/(\d+)px/);
+        var match = cssValue.match(/(\d+(\.\d+)?)px/);
         if (match) {
             return Number(match[1]);
         }
@@ -13442,6 +13442,7 @@
     var SNAPSHOT_LIMI_HEIGHT = 70;
     var DRAG_ICON_SIZE = 24;
     var DRAG_ICON_OFFSET = 5;
+    var DRAG_SNAPSHOT_OFFSET = 15; // 拖拽内容距离鼠标偏移量
     var TheDndComponent = /** @class */ (function () {
         function TheDndComponent(renderer, elementRef, ngZone, cdr) {
             this.renderer = renderer;
@@ -13543,7 +13544,7 @@
         TheDndComponent.prototype.onDragStart = function (event) {
             this.isDraging = true;
             this.dragChange.emit(this.isDraging);
-            this.dragSnapshotContent = document.querySelector('.drag-snapshot-container');
+            this.dragSnapshotContent = this.elementRef.nativeElement.nextSibling;
             this.dragSnapshotContent.className = 'the-editor-typo drag-snapshot-container';
             this.dragSnapshotContent.appendChild(this.dragElement.cloneNode(true));
             this.dragElement.style.opacity = '0.3';
@@ -13569,28 +13570,20 @@
                 var _b = this.editableElement.getBoundingClientRect(), editorLeft = _b.left, editorTop = _b.top, height = _b.height;
                 var top = 0;
                 var left = 0;
-                if (editorLeft > 0) {
-                    if (event.clientX + this.dragElementWidth / 2 > offsetWidth) {
-                        left = event.pageX - editorLeft - this.elementRef.nativeElement.offsetWidth;
-                    }
-                    else {
-                        left = Math.max(event.pageX - editorLeft, -editorLeft) + 10;
-                    }
+                if (event.clientX + this.dragElementWidth / 2 > offsetWidth) {
+                    left = event.pageX - editorLeft - this.nativeElement.offsetWidth;
                 }
-                var paddingTop = 0; // paddingTop: 编辑器距离顶部的距离
-                if (editorTop >= 0) {
-                    // 无滚动情况下
-                    top = event.clientY - this.editableElement.offsetTop;
-                    paddingTop = editorTop - this.editableElement.offsetTop;
+                else {
+                    left = Math.max(event.pageX - editorLeft, -editorLeft) + DRAG_SNAPSHOT_OFFSET;
+                }
+                var scrollTop = document.documentElement.scrollTop;
+                var editorMarginTop = editorTop + scrollTop; // 编辑器距离顶部间距
+                if (event.clientY + this.dragElementHeight + DRAG_SNAPSHOT_OFFSET > document.documentElement.offsetHeight) {
+                    top = event.pageY - editorMarginTop - this.nativeElement.offsetHeight + DRAG_SNAPSHOT_OFFSET;
+                    top = Math.min(top, height - this.editableElement.offsetTop);
                 }
                 else {
-                    // 有滚动距离
-                    top = Math.abs(editorTop) + event.clientY; // 滚动距离 + 鼠标clientY
-                    paddingTop = event.pageY - this.editableElement.offsetTop - top;
-                    // 防止底部出现滚动条
-                    if (paddingTop < height - top) {
-                        top = top + paddingTop;
-                    }
+                    top = event.pageY - editorMarginTop + this.editableElement.offsetTop + DRAG_SNAPSHOT_OFFSET;
                 }
                 this.updateDndContainerPosition(left + 'px', top + 'px');
                 this.setSnapshotStyle(event);
@@ -13635,7 +13628,7 @@
             var _b = this.dragElement.getBoundingClientRect(), width = _b.width, height = _b.height;
             this.dragElementHeight = height;
             this.dragElementWidth = width;
-            var dragSnapshotContentStyle = "visibility: visible; width: " + (width + SNAPSHOT_PADDING_WIDTH * 2) + "px;";
+            var dragSnapshotContentStyle = "display: block; min-height: 0; width: " + (width + SNAPSHOT_PADDING_WIDTH * 2) + "px;";
             if (height > SNAPSHOT_LIMI_HEIGHT) {
                 dragSnapshotContentStyle = dragSnapshotContentStyle + 'transform: scale(0.45);';
                 this.dragElementHeight = this.dragElementHeight * 0.45;
@@ -13644,7 +13637,7 @@
             var snapshotTop = 0;
             var snapshotLeft = 0;
             // 上下移动：超出屏幕高度，重新设置snapshot的位置
-            if (event.clientY + this.dragElementHeight > document.documentElement.offsetHeight) {
+            if (event.clientY + this.dragElementHeight + DRAG_SNAPSHOT_OFFSET > document.documentElement.offsetHeight) {
                 snapshotTop = this.dragElementHeight;
             }
             else {
@@ -13667,7 +13660,8 @@
         };
         TheDndComponent.prototype.setVisibility = function (visible) {
             if (visible === void 0) { visible = true; }
-            this.nativeElement.parentNode.style.visibility = visible ? 'visible' : 'hidden';
+            var dndContainer = this.nativeElement.parentNode;
+            dndContainer.style.display = visible ? 'block' : 'none';
         };
         TheDndComponent.prototype.ngOnDestroy = function () {
             this.destroy$.next();