Skip to content

Commit 534ce56

Browse files
committed
fix: Fix typo #62
1 parent 05a32c1 commit 534ce56

File tree

19 files changed

+138
-80
lines changed

19 files changed

+138
-80
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

6+
## [0.9.7] - 2019-10-16
7+
### Fixed
8+
* Update PreactX
9+
* Fix typo that `elemenGuildelines` to `elementGuidelines` #62
10+
11+
612
## [0.9.6] - 2019-10-14
713
### Fixed
814
* Update PreactX

package-lock.json

Lines changed: 40 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "moveable",
3-
"version": "0.9.6",
3+
"version": "0.9.7",
44
"description": "Moveable is Draggable, Resizable, Scalable, Rotatable, Warpable, Pinchable, Groupable, Snappable.",
55
"main": "./dist/moveable.cjs.js",
66
"module": "./dist/moveable.esm.js",
@@ -54,17 +54,16 @@
5454
},
5555
"homepage": "https://github.com/daybrush/moveable#readme",
5656
"dependencies": {
57-
"@daybrush/drag": "^0.10.1",
57+
"@daybrush/drag": "^0.10.2",
5858
"@daybrush/utils": "^0.10.1",
5959
"@egjs/agent": "^2.1.5",
6060
"@egjs/children-differ": "^1.0.0",
6161
"@egjs/component": "^2.1.2",
6262
"framework-utils": "^0.2.1",
63-
"preact-moveable": "^0.11.12"
63+
"preact-moveable": "^0.11.13"
6464
},
6565
"devDependencies": {
66-
"@babel/generator": "^7.2.2",
67-
"@daybrush/builder": "^0.1.1",
66+
"@daybrush/builder": "^0.1.2",
6867
"@daybrush/demo": "0.0.2",
6968
"@daybrush/jsdoc": "^0.3.7",
7069
"@daybrush/release": "^0.2.4",

packages/ngx-moveable/projects/ngx-moveable/package-lock.json

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ngx-moveable/projects/ngx-moveable/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ngx-moveable",
3-
"version": "0.5.5",
3+
"version": "0.5.6",
44
"description": "An Angular Component that create Moveable, Draggable, Resizable, Scalable, Rotatable, Warpable, Pinchable, Groupable, Snappable.",
55
"repository": {
66
"type": "git",
@@ -44,6 +44,6 @@
4444
},
4545
"dependencies": {
4646
"framework-utils": "^0.2.1",
47-
"moveable": "^0.9.6"
47+
"moveable": "^0.9.7"
4848
}
4949
}

packages/ngx-moveable/projects/ngx-moveable/src/ngx-moveable.component.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
OnInit, OnChanges, SimpleChanges, EventEmitter, Output
44
} from '@angular/core';
55
import Moveable, {
6-
PROPERTIES, EVENTS, MoveableOptions, MoveableGetterSetter, MoveableEvents,
6+
PROPERTIES, EVENTS, MoveableOptions,
77
OnDrag, OnDragStart, OnDragEnd,
88
OnResize, OnResizeStart, OnResizeEnd,
99
OnScaleStart, OnScale, OnScaleEnd,
@@ -16,6 +16,7 @@ import Moveable, {
1616
OnPinchStart, OnPinchGroupStart, OnPinchGroup, OnPinchGroupEnd, OnClickGroup,
1717
} from 'moveable';
1818
import { IObject } from '@daybrush/utils';
19+
import { NgxMoveableInterface } from './types';
1920

2021

2122
// type NgxMoveableEmitter = {
@@ -30,7 +31,8 @@ import { IObject } from '@daybrush/utils';
3031
selector: 'ngx-moveable',
3132
template: '',
3233
})
33-
export class NgxMoveableComponent implements OnDestroy, OnInit, OnChanges, Required<MoveableOptions> {
34+
export class NgxMoveableComponent
35+
implements OnDestroy, OnInit, OnChanges, Required<MoveableOptions>, NgxMoveableInterface {
3436
@Input() public draggable!: boolean;
3537
@Input() public resizable!: boolean;
3638
@Input() public scalable!: boolean;
@@ -52,7 +54,7 @@ export class NgxMoveableComponent implements OnDestroy, OnInit, OnChanges, Requi
5254
@Input() public snapThreshold!: number;
5355
@Input() public horizontalGuidelines!: number[];
5456
@Input() public verticalGuidelines!: number[];
55-
@Input() public elementGuildelines!: Element[];
57+
@Input() public elementGuidelines!: Element[];
5658
@Input() public bounds!: { left?: number, top?: number, right?: number, bottom?: number };
5759
@Input() public dragArea!: boolean;
5860
@Input() public rotationPosition!: 'top' | 'bottom' | 'left' | 'right';
@@ -141,18 +143,26 @@ export class NgxMoveableComponent implements OnDestroy, OnInit, OnChanges, Requi
141143
moveable[name] = currentValue;
142144
}
143145
}
146+
ngOnDestroy() {
147+
this.moveable.destroy();
148+
}
144149
isMoveableElement(target: HTMLElement | SVGElement) {
145150
return this.moveable.isMoveableElement(target);
146151
}
147-
148152
updateRect() {
149153
this.moveable.updateRect();
150154
}
151-
152-
updateTarget(): void {
155+
updateTarget() {
153156
this.moveable.updateTarget();
154157
}
155-
ngOnDestroy(): void {
158+
getRect() {
159+
return this.moveable.getRect();
160+
}
161+
isInside(clientX: number, clientY: number) {
162+
return this.moveable.isInside(clientX, clientY);
163+
}
164+
destroy() {
156165
this.moveable.destroy();
157166
}
167+
158168
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { MoveableInterface } from 'moveable';
2+
3+
export type NgxMoveableKeys = Exclude<keyof MoveableInterface, "dragStart">;
4+
export type NgxMoveableInterface = {
5+
[key in NgxMoveableKeys]: MoveableInterface[key];
6+
};

packages/preact-moveable/package-lock.json

Lines changed: 18 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/preact-moveable/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "preact-moveable",
3-
"version": "0.11.12",
3+
"version": "0.11.13",
44
"description": "A Preact Component that create Moveable, Draggable, Resizable, Scalable, Rotatable, Pinchable, Groupable, Snappable.",
55
"main": "./dist/moveable.cjs.js",
66
"module": "./dist/moveable.esm.js",
@@ -60,13 +60,13 @@
6060
"typescript": "^3.4.5"
6161
},
6262
"dependencies": {
63-
"@daybrush/drag": "^0.10.1",
63+
"@daybrush/drag": "^0.10.2",
6464
"@daybrush/utils": "^0.10.1",
6565
"@egjs/agent": "^2.1.5",
6666
"@egjs/children-differ": "^1.0.0",
6767
"framework-utils": "^0.2.1",
6868
"preact-compat": "^3.0.0",
6969
"preact-css-styler": "^0.4.1",
70-
"react-moveable": "^0.12.9"
70+
"react-moveable": "^0.12.10"
7171
}
7272
}

0 commit comments

Comments
 (0)