Adam Shaw 7 lat temu
rodzic
commit
de2ec630da

+ 3 - 3
src/common/OffsetCoordCache.ts

@@ -1,10 +1,10 @@
 import { getClippingParents, computeRect } from '../util/dom-geom'
 import { pointInsideRect } from '../util/geom'
-import { ElScrollControllerCache } from '../common/scroll-geom-cache'
+import { ElementScrollGeomCache } from '../common/scroll-geom-cache'
 
 export default class OffsetCoordCache { // TODO: rename to OffsetTracker?
 
-  scrollCaches: ElScrollControllerCache[]
+  scrollCaches: ElementScrollGeomCache[]
   originOffsetLeft: number
   originOffsetTop: number
 
@@ -14,7 +14,7 @@ export default class OffsetCoordCache { // TODO: rename to OffsetTracker?
     this.originOffsetTop = rect.top
 
     this.scrollCaches = getClippingParents(el).map(function(el) {
-      return new ElScrollControllerCache(el, true) // listen=true
+      return new ElementScrollGeomCache(el, true) // listen=true
     })
   }
 

+ 1 - 1
src/common/scroll-controller.ts

@@ -36,7 +36,7 @@ export abstract class ScrollController {
 
 }
 
-export class ElScrollController extends ScrollController {
+export class ElementScrollController extends ScrollController {
 
   el: HTMLElement
 

+ 6 - 6
src/common/scroll-geom-cache.ts

@@ -1,8 +1,8 @@
 import { Rect } from '../util/geom'
 import { computeRect } from '../util/dom-geom'
-import { ScrollController, ElScrollController, WindowScrollController } from './scroll-controller'
+import { ScrollController, ElementScrollController, WindowScrollController } from './scroll-controller'
 
-export abstract class ScrollControllerCache extends ScrollController {
+export abstract class ScrollGeomCache extends ScrollController { // needs to extend ScrollController?
 
   rect: Rect
   scrollController: ScrollController
@@ -98,12 +98,12 @@ export abstract class ScrollControllerCache extends ScrollController {
 
 }
 
-export class ElScrollControllerCache extends ScrollControllerCache {
+export class ElementScrollGeomCache extends ScrollGeomCache {
 
-  scrollController: ElScrollController
+  scrollController: ElementScrollController
 
   constructor(el: HTMLElement, doesListening) {
-    super(new ElScrollController(el), doesListening)
+    super(new ElementScrollController(el), doesListening)
   }
 
   getEventTarget(): EventTarget {
@@ -116,7 +116,7 @@ export class ElScrollControllerCache extends ScrollControllerCache {
 
 }
 
-export class WindowScrollControllerCache extends ScrollControllerCache {
+export class WindowScrollGeomCache extends ScrollGeomCache {
 
   scrollController: WindowScrollController
 

+ 5 - 5
src/dnd/AutoScroller.ts

@@ -1,7 +1,7 @@
-import { ScrollControllerCache, ElScrollControllerCache, WindowScrollControllerCache } from '../common/scroll-geom-cache'
+import { ScrollGeomCache, ElementScrollGeomCache, WindowScrollGeomCache } from '../common/scroll-geom-cache'
 
 interface Side { // rename to Edge?
-  controller: ScrollControllerCache
+  controller: ScrollGeomCache
   name: 'top' | 'left' | 'right' | 'bottom'
   distance: number
 }
@@ -27,7 +27,7 @@ export default class AutoScroller {
   everMovedLeft: boolean = false
   everMovedRight: boolean = false
 
-  private controllers: ScrollControllerCache[] // rename to caches?
+  private controllers: ScrollGeomCache[] // rename to caches?
   private msSinceRequest: number
 
   start(pageX: number, pageY: number) {
@@ -165,9 +165,9 @@ export default class AutoScroller {
   private buildControllers() {
     return this.queryScrollerEls().map((el) => {
       if (el === window) {
-        return new WindowScrollControllerCache(false) // don't listen to user-generated scrolls
+        return new WindowScrollGeomCache(false) // don't listen to user-generated scrolls
       } else {
-        return new ElScrollControllerCache(el, false) // don't listen to user-generated scrolls
+        return new ElementScrollGeomCache(el, false) // don't listen to user-generated scrolls
       }
     })
   }