@tft/interact 12.4.3 → 12.5.0

package/bundles/tft-interact.umd.js

@@ -361,6 +361,7 @@
                 },] }
     ];
 
+    var INTERACT_ROOT_CONFIG = new i0.InjectionToken('INTERACT_ROOT_CONFIG_PARAMS');
     var DEFAULT_REGISTRY_ID = 'DEFAULT';
     /**
      * Default initial value for Delta BehaviorSubject
@@ -388,14 +389,17 @@
     };
 
     var InteractService = /** @class */ (function () {
-        function InteractService(rendererFactory, ngZone) {
+        function InteractService(rendererFactory, ngZone, rootConfig) {
             this.rendererFactory = rendererFactory;
             this.ngZone = ngZone;
+            this.rootConfig = rootConfig;
             this._interactableIndex = 0;
             this._dropzoneIndex = 0;
             // TODO: consider using Map here
             this.dragRegistrySystem = {};
+            this.cssUnit = 'px';
             this.renderer = this.rendererFactory.createRenderer(null, null);
+            this.cssUnit = (rootConfig === null || rootConfig === void 0 ? void 0 : rootConfig.cssDimensionUnit) || 'px';
         }
         InteractService.prototype.addDeltaToPosition = function (delta, position) {
             return {
@@ -517,8 +521,8 @@
         };
         InteractService.prototype.interactableExistOnRegistry = function (interactId, registryId) {
             if (registryId === void 0) { registryId = DEFAULT_REGISTRY_ID; }
-            return this.dragRegistrySystem.hasOwnProperty(registryId)
-                && this.dragRegistrySystem[registryId].hasOwnProperty(interactId);
+            // eslint-disable-next-line no-prototype-builtins
+            return this.dragRegistrySystem.hasOwnProperty(registryId) && this.dragRegistrySystem[registryId].hasOwnProperty(interactId);
         };
         /**
          * Uses renderer to set width and height of angular component
@@ -532,15 +536,15 @@
                 return;
             var accountForScaleDirective = (_a = target.resizeRef) === null || _a === void 0 ? void 0 : _a.account_for_scale_dir;
             if (accountForScaleDirective) {
-                var scaleX = accountForScaleDirective.scaleX, scaleY = accountForScaleDirective.scaleY;
-                var scaledWidth = width / scaleX;
-                var scaledHeight = height / scaleY;
-                this.renderer.setStyle(target, 'width', scaledWidth + "px");
-                this.renderer.setStyle(target, 'height', scaledHeight + "px");
+                var scale = accountForScaleDirective.scale;
+                var scaledWidth = width / scale;
+                var scaledHeight = height / scale;
+                this.renderer.setStyle(target, 'width', "" + scaledWidth + this.cssUnit);
+                this.renderer.setStyle(target, 'height', "" + scaledHeight + this.cssUnit);
             }
             else {
-                this.renderer.setStyle(target, 'width', width + "px");
-                this.renderer.setStyle(target, 'height', height + "px");
+                this.renderer.setStyle(target, 'width', "" + width + this.cssUnit);
+                this.renderer.setStyle(target, 'height', "" + height + this.cssUnit);
             }
         };
         /**
@@ -553,15 +557,16 @@
             var _a, _b;
             if (!(position === null || position === void 0 ? void 0 : position.targetElement))
                 return;
-            var accountForScaleDirective = (_b = (_a = position.targetElement) === null || _a === void 0 ? void 0 : _a.dragRef) === null || _b === void 0 ? void 0 : _b.account_for_scale_dir;
+            var dragRef = (_a = position.targetElement) === null || _a === void 0 ? void 0 : _a.dragRef;
+            var accountForScaleDirective = (dragRef === null || dragRef === void 0 ? void 0 : dragRef.account_for_scale_dir) || ((_b = dragRef === null || dragRef === void 0 ? void 0 : dragRef.dragRoot) === null || _b === void 0 ? void 0 : _b.account_for_scale_dir);
             if (accountForScaleDirective) {
-                var scaleX = accountForScaleDirective.scaleX, scaleY = accountForScaleDirective.scaleY;
-                this.renderer.setStyle(position.targetElement, 'left', x / scaleX + "px");
-                this.renderer.setStyle(position.targetElement, 'top', y / scaleY + "px");
+                var scale = accountForScaleDirective.scale;
+                this.renderer.setStyle(position.targetElement, 'left', "" + x / scale + this.cssUnit);
+                this.renderer.setStyle(position.targetElement, 'top', "" + y / scale + this.cssUnit);
             }
             else {
-                this.renderer.setStyle(position.targetElement, 'left', x + "px");
-                this.renderer.setStyle(position.targetElement, 'top', y + "px");
+                this.renderer.setStyle(position.targetElement, 'left', "" + x + this.cssUnit);
+                this.renderer.setStyle(position.targetElement, 'top', "" + y + this.cssUnit);
             }
         };
         /**
@@ -571,7 +576,7 @@
          * @param y the position along the y axis
          */
         InteractService.prototype.createTransformString = function (x, y) {
-            return "translate3d(" + x + "px, " + y + "px, 0)";
+            return "translate3d(" + x + this.cssUnit + ", " + y + this.cssUnit + ", 0)";
         };
         InteractService.prototype.calculatePositionInElement = function (zoneElement, dragElement, scale) {
             // TODO: this calculation may not cover a lot of scenarios, keep an eye out for possible improvements
@@ -579,23 +584,25 @@
             var dragRect = dragElement.getBoundingClientRect();
             var position = scale
                 ? {
-                    x: (dragRect.left - zoneRect.left) / scale.x || 1,
-                    y: (dragRect.top - zoneRect.top) / scale.y || 1
+                    x: (dragRect.left - zoneRect.left) / scale || 1,
+                    y: (dragRect.top - zoneRect.top) / scale || 1
                 } : {
                 x: dragRect.left - zoneRect.left,
                 y: dragRect.top - zoneRect.top
             };
+            // console.log({ y:position.y, drt:dragRect.top, zrt: zoneRect.top})
             return position;
         };
         return InteractService;
     }());
-    InteractService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function InteractService_Factory() { return new InteractService(i0__namespace.ɵɵinject(i0__namespace.RendererFactory2), i0__namespace.ɵɵinject(i0__namespace.NgZone)); }, token: InteractService, providedIn: "root" });
+    InteractService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function InteractService_Factory() { return new InteractService(i0__namespace.ɵɵinject(i0__namespace.RendererFactory2), i0__namespace.ɵɵinject(i0__namespace.NgZone), i0__namespace.ɵɵinject(INTERACT_ROOT_CONFIG, 8)); }, token: InteractService, providedIn: "root" });
     InteractService.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
     InteractService.ctorParameters = function () { return [
         { type: i0.RendererFactory2 },
-        { type: i0.NgZone }
+        { type: i0.NgZone },
+        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [INTERACT_ROOT_CONFIG,] }] }
     ]; };
 
     /**
@@ -607,19 +614,9 @@
     var AccountForScaleDirective = /** @class */ (function () {
         function AccountForScaleDirective(el) {
             this.el = el;
-            this.scaleX = 1;
-            this.scaleY = 1;
-        }
-        Object.defineProperty(AccountForScaleDirective.prototype, "scale", {
             // this setup allows consumers to set x, y scale independently or just set them both with scale
-            set: function (val) {
-                this.scaleY = val;
-                this.scaleX = val;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        ;
+            this.scale = 1;
+        }
         return AccountForScaleDirective;
     }());
     AccountForScaleDirective.decorators = [
@@ -631,9 +628,7 @@
         { type: i0.ElementRef }
     ]; };
     AccountForScaleDirective.propDecorators = {
-        scale: [{ type: i0.Input }],
-        scaleX: [{ type: i0.Input }],
-        scaleY: [{ type: i0.Input }]
+        scale: [{ type: i0.Input }]
     };
 
     var DropzoneDirective = /** @class */ (function () {
@@ -692,13 +687,10 @@
          * @param event the drop event emitted by interact, extended with extra fields we added to
          */
         DropzoneDirective.prototype.mapDropzoneEvent = function (event) {
-            var _a, _b;
+            var _a, _b, _c;
             var zoneElement = event.target;
             var dragElement = (_b = (_a = event.relatedTarget) === null || _a === void 0 ? void 0 : _a.dragRef) === null || _b === void 0 ? void 0 : _b.previewRef;
-            var scale = this.account_for_scale_dir ? {
-                x: this.account_for_scale_dir.scaleX,
-                y: this.account_for_scale_dir.scaleY
-            } : null;
+            var scale = ((_c = this.account_for_scale_dir) === null || _c === void 0 ? void 0 : _c.scale) || null;
             var positionInDropTarget = zoneElement && dragElement
                 ? this.interactService.calculatePositionInElement(zoneElement, dragElement, scale)
                 : null;
@@ -797,22 +789,19 @@
      * @note this directive will overwrite any style transformations (e.g. transform: scale(2); )
      */
     var DragRootDirective = /** @class */ (function () {
-        function DragRootDirective(el, account_for_scale_dir) {
+        function DragRootDirective(el, 
+        // This is used when passing a dragRoot as in input to a draggable element that not a child of that dragRoot
+        // It allows the the interact service to check if the drag root has some scaling applied to it and account for it when the component is dragged
+        account_for_scale_dir) {
             this.el = el;
-            // This accounts for a bug where drag element is misaligned when using a drag root
-            // with a dropzone inside of it and a drag item inside the dropzone
-            // e.g <div tftDragRoot> <div tftDropzone> <div tftDraggable</div> </div> </div>
-            // TODO: This is a band-aid, root cause in misunderstood, it started after switching from
-            // using `translate3d` to top/left for positioning
-            if (!account_for_scale_dir) {
-                el.nativeElement.style.transform = 'scale(1)';
-            }
+            this.account_for_scale_dir = account_for_scale_dir;
         }
         return DragRootDirective;
     }());
     DragRootDirective.decorators = [
         { type: i0.Directive, args: [{
-                    selector: '[tftDragRoot]'
+                    selector: '[tftDragRoot]',
+                    exportAs: 'tftDragRoot'
                 },] }
     ];
     DragRootDirective.ctorParameters = function () { return [
@@ -850,12 +839,12 @@
         }
         DraggableDirective.prototype.ngOnInit = function () {
             var _this = this;
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e;
             this.interactable = this.initiateDragEvents(this.dragConfig, this.el.nativeElement);
-            this.dragRoot = this.dragRoot || ((_b = (_a = this.drag_root_dir) === null || _a === void 0 ? void 0 : _a.el) === null || _b === void 0 ? void 0 : _b.nativeElement) || this._document.body;
+            this.dragRootEl = (((_b = (_a = this.dragRoot) === null || _a === void 0 ? void 0 : _a.el) === null || _b === void 0 ? void 0 : _b.nativeElement) || ((_d = (_c = this.drag_root_dir) === null || _c === void 0 ? void 0 : _c.el) === null || _d === void 0 ? void 0 : _d.nativeElement)) || this._document.body;
             // register with parent dropzone if it exists, otherwise use default
             // this gives us a place on the registry to store our drag items that don't have a dropzone
-            this.registryId = ((_c = this.dropzone_dir) === null || _c === void 0 ? void 0 : _c.dropzoneId) || DEFAULT_REGISTRY_ID;
+            this.registryId = ((_e = this.dropzone_dir) === null || _e === void 0 ? void 0 : _e.dropzoneId) || DEFAULT_REGISTRY_ID;
             // add draggable to directory and store its id
             this.interactableId = this.interactService.addDraggableToRegistry(this.registryId, this.interactableId);
             this.alignPositionWithInputs(this.x, this.y);
@@ -911,7 +900,7 @@
         DraggableDirective.prototype.setDragStyles = function (dragElement) {
             this.renderer.setStyle(dragElement, 'touchAction', 'none');
             this.renderer.setStyle(dragElement, 'zIndex', this.dragZIndex);
-            this.renderer.setStyle(dragElement, 'position', 'fixed');
+            this.renderer.setStyle(dragElement, 'position', 'absolute');
         };
         DraggableDirective.prototype.addDragPropertiesToElement = function (nativeElement) {
             this.renderer.setProperty(nativeElement, 'dropTarget', this.dropzone_dir || null);
@@ -971,8 +960,8 @@
                     }
                     _this.addDragPropertiesToElement(_this.previewRef);
                     _this.setDragStyles(_this.previewRef);
-                    _this.dragRoot.prepend(_this.previewRef);
-                    var _d = _this.interactService.calculatePositionInElement(_this.dragRoot, nativeElement), x = _d.x, y = _d.y;
+                    _this.dragRootEl.prepend(_this.previewRef);
+                    var _f = _this.interactService.calculatePositionInElement(_this.dragRootEl, nativeElement), x = _f.x, y = _f.y;
                     _this.interactService.updatePosition(_this.interactableId, _this.registryId, { x: x, y: y }, _this.previewRef);
                     if (!_this.showPlaceholder) {
                         _this.renderer.setStyle(_this.el.nativeElement, 'display', 'none');
@@ -994,16 +983,15 @@
                 .on('dragend', function (event) {
                 var mappedEvent = _this.mapDragEvent(event);
                 if (!!_this.dropzone_dir && _this.dropzone_dir === event.target.dropTarget) {
-                    var _d = mappedEvent.positionInDropTarget, x = _d.x, y = _d.y;
+                    var _f = mappedEvent.positionInDropTarget, x = _f.x, y = _f.y;
                     _this.setPosition(x, y);
                 }
                 _this.renderer.setStyle(_this.el.nativeElement, 'display', '');
                 _this.dragEnd.emit(mappedEvent);
                 if (_this.el.nativeElement !== _this.previewRef) {
-                    // we do this in a timeout, so that we don't
-                    // remove before the dropzone can get the boundingElementRect
+                    // we do this in a timeout, so that we don't remove before the dropzone can get the boundingElementRect
                     setTimeout(function () {
-                        _this.dragRoot.removeChild(_this.previewRef);
+                        _this.dragRootEl.removeChild(_this.previewRef);
                     });
                 }
             });
@@ -1293,24 +1281,18 @@
     var ApplyScaleDirective = /** @class */ (function () {
         function ApplyScaleDirective(el) {
             this.el = el;
-            this.scaleX = 1;
-            this.scaleY = 1;
-            this.transformOrigin = '0 0';
+            this._scale = 1;
         }
         Object.defineProperty(ApplyScaleDirective.prototype, "scale", {
             // this setup allows consumers to set x, y scale independently or just set them both with scale
             set: function (val) {
-                this.scaleY = val;
-                this.scaleX = val;
+                this._scale;
+                this.fontSize = val + "px";
             },
             enumerable: false,
             configurable: true
         });
         ;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        ApplyScaleDirective.prototype.ngOnChanges = function (_changes) {
-            this.transform = "scaleX(" + this.scaleX + ") scaleY(" + this.scaleY + ")";
-        };
         return ApplyScaleDirective;
     }());
     ApplyScaleDirective.decorators = [
@@ -1323,10 +1305,7 @@
     ]; };
     ApplyScaleDirective.propDecorators = {
         scale: [{ type: i0.Input }],
-        scaleX: [{ type: i0.Input }],
-        scaleY: [{ type: i0.Input }],
-        transform: [{ type: i0.HostBinding, args: ['style.transform',] }],
-        transformOrigin: [{ type: i0.Input }, { type: i0.HostBinding, args: ['style.transformOrigin',] }]
+        fontSize: [{ type: i0.HostBinding, args: ['style.fontSize',] }]
     };
 
     var EXPORTS = [
@@ -1343,11 +1322,22 @@
     var InteractModule = /** @class */ (function () {
         function InteractModule() {
         }
+        InteractModule.forRoot = function (config) {
+            var defaultConfig = { cssDimensionUnit: 'px' };
+            return {
+                ngModule: InteractModule,
+                providers: [
+                    { provide: INTERACT_ROOT_CONFIG, useValue: Object.assign(Object.assign({}, defaultConfig), config) },
+                    InteractService
+                ]
+            };
+        };
         return InteractModule;
     }());
     InteractModule.decorators = [
         { type: i0.NgModule, args: [{
                     imports: [common.CommonModule],
+                    // providers: [{ provide: INTERACT_ROOT_CONFIG, useValue: 'px' }],
                     declarations: __spreadArray([], __read(EXPORTS)),
                     exports: __spreadArray([], __read(EXPORTS))
                 },] }
@@ -1366,6 +1356,7 @@
     exports.DraggableDirective = DraggableDirective;
     exports.DropzoneDirective = DropzoneDirective;
     exports.GesturableDirective = GesturableDirective;
+    exports.INTERACT_ROOT_CONFIG = INTERACT_ROOT_CONFIG;
     exports.InteractModule = InteractModule;
     exports.ResizableDirective = ResizableDirective;
     exports.TFT_DRAG_PREVIEW = TFT_DRAG_PREVIEW;