Skip to content

Commit d2f8d56

Browse files
kloeneredcarroll
authored andcommitted
fix: Updated TS references to Popper (edcarroll#356)
* updated popper.js to 1.14 * fixed Popper namespace issue (which was removed)
1 parent 1324e37 commit d2f8d56

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"element-closest": "^2.0.2",
5555
"extend": "^3.0.1",
5656
"is-ua-webview": "^1.0.0",
57-
"popper.js": "^1.11.1",
57+
"popper.js": "^1.14.0",
5858
"rxjs": "^5.0.1"
5959
},
6060
"devDependencies": {

src/misc/util/services/positioning.service.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { ElementRef } from "@angular/core";
2-
import Popper from "popper.js";
2+
import Popper, { Modifiers, PopperOptions, Placement, Data } from "popper.js";
33

4-
type PopperModifiers = Popper.Modifiers & {
4+
type PopperModifiers = Modifiers & {
55
computeStyle?:{
66
gpuAcceleration:boolean;
77
};
88
};
99
type PopperInstance = Popper & {
10-
options:Popper.PopperOptions & {
10+
options:PopperOptions & {
1111
modifiers:PopperModifiers;
1212
};
1313
};
@@ -43,7 +43,7 @@ export interface IPositionBoundingBox {
4343
right:number;
4444
}
4545

46-
function placementToPopper(placement:PositioningPlacement):Popper.Placement {
46+
function placementToPopper(placement:PositioningPlacement):Placement {
4747
if (!placement || placement === PositioningPlacement.Auto) {
4848
return "auto";
4949
}
@@ -67,7 +67,7 @@ function placementToPopper(placement:PositioningPlacement):Popper.Placement {
6767
}
6868

6969
// Join with hyphen to create Popper compatible placement.
70-
return chosenPlacement.join("-") as Popper.Placement;
70+
return chosenPlacement.join("-") as Placement;
7171
}
7272

7373
function popperToPlacement(popper:string):PositioningPlacement {
@@ -112,7 +112,7 @@ export class PositioningService {
112112
public readonly subject:ElementRef;
113113

114114
private _popper:PopperInstance;
115-
private _popperState:Popper.Data;
115+
private _popperState:Data;
116116
private _placement:PositioningPlacement;
117117

118118
public get placement():PositioningPlacement {
@@ -133,7 +133,7 @@ export class PositioningService {
133133
return popperToPlacement(this._popperState.placement);
134134
}
135135

136-
public get state():Popper.Data {
136+
public get state():Data {
137137
return this._popperState;
138138
}
139139

0 commit comments

Comments
 (0)