@leafer-in/scroll 1.1.2 → 1.2.0

package/dist/scroll.cjs

@@ -1,9 +1,8 @@
 'use strict';
 
-var draw = require('@leafer-ui/draw');
 var core = require('@leafer-ui/core');
 
-class ScrollBar extends draw.Group {
+class ScrollBar extends core.Group {
     get isOutside() { return true; }
     constructor(target, userConfig) {
         super();
@@ -18,7 +17,7 @@ class ScrollBar extends draw.Group {
         }
         this.target = target;
         if (userConfig)
-            draw.DataHelper.assign(this.config, userConfig);
+            core.DataHelper.assign(this.config, userConfig);
         this.changeTheme(this.config.theme);
         this.waitLeafer(this.__listenEvents, this);
     }
@@ -35,7 +34,7 @@ class ScrollBar extends draw.Group {
             style = theme;
         }
         if (!this.scrollXBar)
-            this.addMany(this.scrollXBar = new draw.Box(), this.scrollYBar = new draw.Box());
+            this.addMany(this.scrollXBar = new core.Box(), this.scrollYBar = new core.Box());
         style = Object.assign({ strokeAlign: 'center', opacity: 0.5, width: 6, cornerRadius: 3, hoverStyle: { opacity: 0.6 }, pressStyle: { opacity: 0.7 } }, style);
         if (!style.height)
             style.height = style.width;
@@ -52,7 +51,7 @@ class ScrollBar extends draw.Group {
         const { worldRenderBounds } = zoomLayer;
         if (check && this.scrollBounds && this.scrollBounds.isSame(worldRenderBounds))
             return;
-        this.scrollBounds = new draw.Bounds(worldRenderBounds);
+        this.scrollBounds = new core.Bounds(worldRenderBounds);
         const bounds = canvas.bounds.clone().shrink(padding);
         const totalBounds = bounds.clone().add(worldRenderBounds);
         const ratioX = this.ratioX = bounds.width / totalBounds.width;
@@ -96,8 +95,8 @@ class ScrollBar extends draw.Group {
             scrollYBar.on_(core.DragEvent.DRAG, this.onDrag, this),
             scrollXBar.on_(core.DragEvent.END, this.onDragEnd, this),
             scrollYBar.on_(core.DragEvent.END, this.onDragEnd, this),
-            this.target.on_(draw.RenderEvent.BEFORE, () => this.update(true)),
-            this.target.leafer.on_(draw.ResizeEvent.RESIZE, () => this.update())
+            this.target.on_(core.RenderEvent.BEFORE, () => this.update(true)),
+            this.target.leafer.on_(core.ResizeEvent.RESIZE, () => this.update())
         ];
     }
     __removeListenEvents() {
@@ -112,4 +111,6 @@ class ScrollBar extends draw.Group {
     }
 }
 
+core.Plugin.add('scroll');
+
 exports.ScrollBar = ScrollBar;

package/dist/scroll.esm.js

@@ -1,5 +1,4 @@
-import { Group, DataHelper, Box, Bounds, RenderEvent, ResizeEvent } from '@leafer-ui/draw';
-import { DragEvent } from '@leafer-ui/core';
+import { Group, DataHelper, Box, Bounds, DragEvent, RenderEvent, ResizeEvent, Plugin } from '@leafer-ui/core';
 
 class ScrollBar extends Group {
     get isOutside() { return true; }
@@ -110,4 +109,6 @@ class ScrollBar extends Group {
     }
 }
 
+Plugin.add('scroll');
+
 export { ScrollBar };

package/dist/scroll.esm.min.js

@@ -1 +1 @@
-import{Group as t,DataHelper as i,Box as s,Bounds as e,RenderEvent as r,ResizeEvent as h}from"@leafer-ui/draw";import{DragEvent as o}from"@leafer-ui/core";class a extends t{get isOutside(){return!0}constructor(t,s){super(),this.config={theme:"light",padding:0,minSize:10},t.isApp&&(t.sky.add(this),t=t.tree),this.target=t,s&&i.assign(this.config,s),this.changeTheme(this.config.theme),this.waitLeafer(this.__listenEvents,this)}changeTheme(t){let i;"string"==typeof t?(i={fill:"black",stroke:"rgba(255,255,255,0.8)"},"dark"===t&&(i.fill="white",i.stroke="rgba(0,0,0,0.2)")):i=t,this.scrollXBar||this.addMany(this.scrollXBar=new s,this.scrollYBar=new s),i=Object.assign({strokeAlign:"center",opacity:.5,width:6,cornerRadius:3,hoverStyle:{opacity:.6},pressStyle:{opacity:.7}},i),i.height||(i.height=i.width),this.scrollXBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.scrollYBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.leafer&&this.update()}update(t){if(this.dragScrolling)return;const{minSize:i,padding:s}=this.config,{zoomLayer:r,canvas:h}=this.target.leafer,{worldRenderBounds:o}=r;if(t&&this.scrollBounds&&this.scrollBounds.isSame(o))return;this.scrollBounds=new e(o);const a=h.bounds.clone().shrink(s),n=a.clone().add(o),l=this.ratioX=a.width/n.width,g=this.ratioY=a.height/n.height,d=(a.x-n.x)/n.width,c=(a.y-n.y)/n.height,u=l<1,f=g<1,{scrollXBar:p,scrollYBar:m}=this,{x:_,y:v,width:y,height:w}=a.shrink([2,f?m.width+6:2,u?p.height+6:2,2]);p.set({x:_+y*d,y:v+w+2,width:Math.max(y*l,i),visible:u}),m.set({x:_+y+2,y:v+w*c,height:Math.max(w*g,i),visible:f})}onDrag(t){this.dragScrolling=!0,this.__dragOut=this.app.config.move.dragOut,this.app.config.move.dragOut=!1;const i=t.current===this.scrollXBar,s=this.target.leafer.getValidMove(i?-t.moveX/this.ratioX:0,i?0:-t.moveY/this.ratioY);this.target.moveWorld(s.x,s.y),t.current.moveWorld(s.x&&-s.x*this.ratioX,s.y&&-s.y*this.ratioY)}onDragEnd(){this.dragScrolling=!1,this.app.config.move.dragOut=this.__dragOut}__listenEvents(){const{scrollXBar:t,scrollYBar:i}=this;this.__eventIds=[t.on_(o.DRAG,this.onDrag,this),i.on_(o.DRAG,this.onDrag,this),t.on_(o.END,this.onDragEnd,this),i.on_(o.END,this.onDragEnd,this),this.target.on_(r.BEFORE,(()=>this.update(!0))),this.target.leafer.on_(h.RESIZE,(()=>this.update()))]}__removeListenEvents(){this.off_(this.__eventIds)}destroy(){this.destroyed||(this.__removeListenEvents(),this.target=this.config=null,super.destroy())}}export{a as ScrollBar};
+import{Group as t,DataHelper as i,Box as s,Bounds as e,DragEvent as r,RenderEvent as h,ResizeEvent as o,Plugin as a}from"@leafer-ui/core";class n extends t{get isOutside(){return!0}constructor(t,s){super(),this.config={theme:"light",padding:0,minSize:10},t.isApp&&(t.sky.add(this),t=t.tree),this.target=t,s&&i.assign(this.config,s),this.changeTheme(this.config.theme),this.waitLeafer(this.__listenEvents,this)}changeTheme(t){let i;"string"==typeof t?(i={fill:"black",stroke:"rgba(255,255,255,0.8)"},"dark"===t&&(i.fill="white",i.stroke="rgba(0,0,0,0.2)")):i=t,this.scrollXBar||this.addMany(this.scrollXBar=new s,this.scrollYBar=new s),i=Object.assign({strokeAlign:"center",opacity:.5,width:6,cornerRadius:3,hoverStyle:{opacity:.6},pressStyle:{opacity:.7}},i),i.height||(i.height=i.width),this.scrollXBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.scrollYBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.leafer&&this.update()}update(t){if(this.dragScrolling)return;const{minSize:i,padding:s}=this.config,{zoomLayer:r,canvas:h}=this.target.leafer,{worldRenderBounds:o}=r;if(t&&this.scrollBounds&&this.scrollBounds.isSame(o))return;this.scrollBounds=new e(o);const a=h.bounds.clone().shrink(s),n=a.clone().add(o),l=this.ratioX=a.width/n.width,g=this.ratioY=a.height/n.height,d=(a.x-n.x)/n.width,c=(a.y-n.y)/n.height,u=l<1,p=g<1,{scrollXBar:_,scrollYBar:f}=this,{x:v,y:m,width:y,height:B}=a.shrink([2,p?f.width+6:2,u?_.height+6:2,2]);_.set({x:v+y*d,y:m+B+2,width:Math.max(y*l,i),visible:u}),f.set({x:v+y+2,y:m+B*c,height:Math.max(B*g,i),visible:p})}onDrag(t){this.dragScrolling=!0,this.__dragOut=this.app.config.move.dragOut,this.app.config.move.dragOut=!1;const i=t.current===this.scrollXBar,s=this.target.leafer.getValidMove(i?-t.moveX/this.ratioX:0,i?0:-t.moveY/this.ratioY);this.target.moveWorld(s.x,s.y),t.current.moveWorld(s.x&&-s.x*this.ratioX,s.y&&-s.y*this.ratioY)}onDragEnd(){this.dragScrolling=!1,this.app.config.move.dragOut=this.__dragOut}__listenEvents(){const{scrollXBar:t,scrollYBar:i}=this;this.__eventIds=[t.on_(r.DRAG,this.onDrag,this),i.on_(r.DRAG,this.onDrag,this),t.on_(r.END,this.onDragEnd,this),i.on_(r.END,this.onDragEnd,this),this.target.on_(h.BEFORE,(()=>this.update(!0))),this.target.leafer.on_(o.RESIZE,(()=>this.update()))]}__removeListenEvents(){this.off_(this.__eventIds)}destroy(){this.destroyed||(this.__removeListenEvents(),this.target=this.config=null,super.destroy())}}a.add("scroll");export{n as ScrollBar};

package/dist/scroll.js

@@ -1,8 +1,8 @@
 this.LeaferIN = this.LeaferIN || {};
-this.LeaferIN.scroll = (function (exports, draw, core) {
+this.LeaferIN.scroll = (function (exports, core) {
     'use strict';
 
-    class ScrollBar extends draw.Group {
+    class ScrollBar extends core.Group {
         get isOutside() { return true; }
         constructor(target, userConfig) {
             super();
@@ -17,7 +17,7 @@ this.LeaferIN.scroll = (function (exports, draw, core) {
             }
             this.target = target;
             if (userConfig)
-                draw.DataHelper.assign(this.config, userConfig);
+                core.DataHelper.assign(this.config, userConfig);
             this.changeTheme(this.config.theme);
             this.waitLeafer(this.__listenEvents, this);
         }
@@ -34,7 +34,7 @@ this.LeaferIN.scroll = (function (exports, draw, core) {
                 style = theme;
             }
             if (!this.scrollXBar)
-                this.addMany(this.scrollXBar = new draw.Box(), this.scrollYBar = new draw.Box());
+                this.addMany(this.scrollXBar = new core.Box(), this.scrollYBar = new core.Box());
             style = Object.assign({ strokeAlign: 'center', opacity: 0.5, width: 6, cornerRadius: 3, hoverStyle: { opacity: 0.6 }, pressStyle: { opacity: 0.7 } }, style);
             if (!style.height)
                 style.height = style.width;
@@ -51,7 +51,7 @@ this.LeaferIN.scroll = (function (exports, draw, core) {
             const { worldRenderBounds } = zoomLayer;
             if (check && this.scrollBounds && this.scrollBounds.isSame(worldRenderBounds))
                 return;
-            this.scrollBounds = new draw.Bounds(worldRenderBounds);
+            this.scrollBounds = new core.Bounds(worldRenderBounds);
             const bounds = canvas.bounds.clone().shrink(padding);
             const totalBounds = bounds.clone().add(worldRenderBounds);
             const ratioX = this.ratioX = bounds.width / totalBounds.width;
@@ -95,8 +95,8 @@ this.LeaferIN.scroll = (function (exports, draw, core) {
                 scrollYBar.on_(core.DragEvent.DRAG, this.onDrag, this),
                 scrollXBar.on_(core.DragEvent.END, this.onDragEnd, this),
                 scrollYBar.on_(core.DragEvent.END, this.onDragEnd, this),
-                this.target.on_(draw.RenderEvent.BEFORE, () => this.update(true)),
-                this.target.leafer.on_(draw.ResizeEvent.RESIZE, () => this.update())
+                this.target.on_(core.RenderEvent.BEFORE, () => this.update(true)),
+                this.target.leafer.on_(core.ResizeEvent.RESIZE, () => this.update())
             ];
         }
         __removeListenEvents() {
@@ -111,8 +111,10 @@ this.LeaferIN.scroll = (function (exports, draw, core) {
         }
     }
 
+    core.Plugin.add('scroll');
+
     exports.ScrollBar = ScrollBar;
 
     return exports;
 
-})({}, LeaferUI, LeaferUI);
+})({}, LeaferUI);

package/dist/scroll.min.cjs

@@ -1 +1 @@
-"use strict";var t=require("@leafer-ui/draw"),i=require("@leafer-ui/core");class e extends t.Group{get isOutside(){return!0}constructor(i,e){super(),this.config={theme:"light",padding:0,minSize:10},i.isApp&&(i.sky.add(this),i=i.tree),this.target=i,e&&t.DataHelper.assign(this.config,e),this.changeTheme(this.config.theme),this.waitLeafer(this.__listenEvents,this)}changeTheme(i){let e;"string"==typeof i?(e={fill:"black",stroke:"rgba(255,255,255,0.8)"},"dark"===i&&(e.fill="white",e.stroke="rgba(0,0,0,0.2)")):e=i,this.scrollXBar||this.addMany(this.scrollXBar=new t.Box,this.scrollYBar=new t.Box),e=Object.assign({strokeAlign:"center",opacity:.5,width:6,cornerRadius:3,hoverStyle:{opacity:.6},pressStyle:{opacity:.7}},e),e.height||(e.height=e.width),this.scrollXBar.set(Object.assign(Object.assign({},e),{visible:!1})),this.scrollYBar.set(Object.assign(Object.assign({},e),{visible:!1})),this.leafer&&this.update()}update(i){if(this.dragScrolling)return;const{minSize:e,padding:s}=this.config,{zoomLayer:r,canvas:h}=this.target.leafer,{worldRenderBounds:a}=r;if(i&&this.scrollBounds&&this.scrollBounds.isSame(a))return;this.scrollBounds=new t.Bounds(a);const o=h.bounds.clone().shrink(s),n=o.clone().add(a),l=this.ratioX=o.width/n.width,g=this.ratioY=o.height/n.height,d=(o.x-n.x)/n.width,c=(o.y-n.y)/n.height,u=l<1,v=g<1,{scrollXBar:p,scrollYBar:_}=this,{x:f,y:y,width:m,height:B}=o.shrink([2,v?_.width+6:2,u?p.height+6:2,2]);p.set({x:f+m*d,y:y+B+2,width:Math.max(m*l,e),visible:u}),_.set({x:f+m+2,y:y+B*c,height:Math.max(B*g,e),visible:v})}onDrag(t){this.dragScrolling=!0,this.__dragOut=this.app.config.move.dragOut,this.app.config.move.dragOut=!1;const i=t.current===this.scrollXBar,e=this.target.leafer.getValidMove(i?-t.moveX/this.ratioX:0,i?0:-t.moveY/this.ratioY);this.target.moveWorld(e.x,e.y),t.current.moveWorld(e.x&&-e.x*this.ratioX,e.y&&-e.y*this.ratioY)}onDragEnd(){this.dragScrolling=!1,this.app.config.move.dragOut=this.__dragOut}__listenEvents(){const{scrollXBar:e,scrollYBar:s}=this;this.__eventIds=[e.on_(i.DragEvent.DRAG,this.onDrag,this),s.on_(i.DragEvent.DRAG,this.onDrag,this),e.on_(i.DragEvent.END,this.onDragEnd,this),s.on_(i.DragEvent.END,this.onDragEnd,this),this.target.on_(t.RenderEvent.BEFORE,(()=>this.update(!0))),this.target.leafer.on_(t.ResizeEvent.RESIZE,(()=>this.update()))]}__removeListenEvents(){this.off_(this.__eventIds)}destroy(){this.destroyed||(this.__removeListenEvents(),this.target=this.config=null,super.destroy())}}exports.ScrollBar=e;
+"use strict";var t=require("@leafer-ui/core");class i extends t.Group{get isOutside(){return!0}constructor(i,s){super(),this.config={theme:"light",padding:0,minSize:10},i.isApp&&(i.sky.add(this),i=i.tree),this.target=i,s&&t.DataHelper.assign(this.config,s),this.changeTheme(this.config.theme),this.waitLeafer(this.__listenEvents,this)}changeTheme(i){let s;"string"==typeof i?(s={fill:"black",stroke:"rgba(255,255,255,0.8)"},"dark"===i&&(s.fill="white",s.stroke="rgba(0,0,0,0.2)")):s=i,this.scrollXBar||this.addMany(this.scrollXBar=new t.Box,this.scrollYBar=new t.Box),s=Object.assign({strokeAlign:"center",opacity:.5,width:6,cornerRadius:3,hoverStyle:{opacity:.6},pressStyle:{opacity:.7}},s),s.height||(s.height=s.width),this.scrollXBar.set(Object.assign(Object.assign({},s),{visible:!1})),this.scrollYBar.set(Object.assign(Object.assign({},s),{visible:!1})),this.leafer&&this.update()}update(i){if(this.dragScrolling)return;const{minSize:s,padding:e}=this.config,{zoomLayer:r,canvas:h}=this.target.leafer,{worldRenderBounds:a}=r;if(i&&this.scrollBounds&&this.scrollBounds.isSame(a))return;this.scrollBounds=new t.Bounds(a);const o=h.bounds.clone().shrink(e),n=o.clone().add(a),l=this.ratioX=o.width/n.width,g=this.ratioY=o.height/n.height,d=(o.x-n.x)/n.width,c=(o.y-n.y)/n.height,u=l<1,v=g<1,{scrollXBar:p,scrollYBar:_}=this,{x:f,y:y,width:m,height:B}=o.shrink([2,v?_.width+6:2,u?p.height+6:2,2]);p.set({x:f+m*d,y:y+B+2,width:Math.max(m*l,s),visible:u}),_.set({x:f+m+2,y:y+B*c,height:Math.max(B*g,s),visible:v})}onDrag(t){this.dragScrolling=!0,this.__dragOut=this.app.config.move.dragOut,this.app.config.move.dragOut=!1;const i=t.current===this.scrollXBar,s=this.target.leafer.getValidMove(i?-t.moveX/this.ratioX:0,i?0:-t.moveY/this.ratioY);this.target.moveWorld(s.x,s.y),t.current.moveWorld(s.x&&-s.x*this.ratioX,s.y&&-s.y*this.ratioY)}onDragEnd(){this.dragScrolling=!1,this.app.config.move.dragOut=this.__dragOut}__listenEvents(){const{scrollXBar:i,scrollYBar:s}=this;this.__eventIds=[i.on_(t.DragEvent.DRAG,this.onDrag,this),s.on_(t.DragEvent.DRAG,this.onDrag,this),i.on_(t.DragEvent.END,this.onDragEnd,this),s.on_(t.DragEvent.END,this.onDragEnd,this),this.target.on_(t.RenderEvent.BEFORE,(()=>this.update(!0))),this.target.leafer.on_(t.ResizeEvent.RESIZE,(()=>this.update()))]}__removeListenEvents(){this.off_(this.__eventIds)}destroy(){this.destroyed||(this.__removeListenEvents(),this.target=this.config=null,super.destroy())}}t.Plugin.add("scroll"),exports.ScrollBar=i;

package/dist/scroll.min.js

@@ -1 +1 @@
-this.LeaferIN=this.LeaferIN||{},this.LeaferIN.scroll=function(t,s,i){"use strict";class e extends s.Group{get isOutside(){return!0}constructor(t,i){super(),this.config={theme:"light",padding:0,minSize:10},t.isApp&&(t.sky.add(this),t=t.tree),this.target=t,i&&s.DataHelper.assign(this.config,i),this.changeTheme(this.config.theme),this.waitLeafer(this.__listenEvents,this)}changeTheme(t){let i;"string"==typeof t?(i={fill:"black",stroke:"rgba(255,255,255,0.8)"},"dark"===t&&(i.fill="white",i.stroke="rgba(0,0,0,0.2)")):i=t,this.scrollXBar||this.addMany(this.scrollXBar=new s.Box,this.scrollYBar=new s.Box),i=Object.assign({strokeAlign:"center",opacity:.5,width:6,cornerRadius:3,hoverStyle:{opacity:.6},pressStyle:{opacity:.7}},i),i.height||(i.height=i.width),this.scrollXBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.scrollYBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.leafer&&this.update()}update(t){if(this.dragScrolling)return;const{minSize:i,padding:e}=this.config,{zoomLayer:r,canvas:h}=this.target.leafer,{worldRenderBounds:a}=r;if(t&&this.scrollBounds&&this.scrollBounds.isSame(a))return;this.scrollBounds=new s.Bounds(a);const n=h.bounds.clone().shrink(e),o=n.clone().add(a),l=this.ratioX=n.width/o.width,g=this.ratioY=n.height/o.height,d=(n.x-o.x)/o.width,c=(n.y-o.y)/o.height,u=l<1,v=g<1,{scrollXBar:f,scrollYBar:p}=this,{x:_,y:y,width:m,height:B}=n.shrink([2,v?p.width+6:2,u?f.height+6:2,2]);f.set({x:_+m*d,y:y+B+2,width:Math.max(m*l,i),visible:u}),p.set({x:_+m+2,y:y+B*c,height:Math.max(B*g,i),visible:v})}onDrag(t){this.dragScrolling=!0,this.__dragOut=this.app.config.move.dragOut,this.app.config.move.dragOut=!1;const s=t.current===this.scrollXBar,i=this.target.leafer.getValidMove(s?-t.moveX/this.ratioX:0,s?0:-t.moveY/this.ratioY);this.target.moveWorld(i.x,i.y),t.current.moveWorld(i.x&&-i.x*this.ratioX,i.y&&-i.y*this.ratioY)}onDragEnd(){this.dragScrolling=!1,this.app.config.move.dragOut=this.__dragOut}__listenEvents(){const{scrollXBar:t,scrollYBar:e}=this;this.__eventIds=[t.on_(i.DragEvent.DRAG,this.onDrag,this),e.on_(i.DragEvent.DRAG,this.onDrag,this),t.on_(i.DragEvent.END,this.onDragEnd,this),e.on_(i.DragEvent.END,this.onDragEnd,this),this.target.on_(s.RenderEvent.BEFORE,(()=>this.update(!0))),this.target.leafer.on_(s.ResizeEvent.RESIZE,(()=>this.update()))]}__removeListenEvents(){this.off_(this.__eventIds)}destroy(){this.destroyed||(this.__removeListenEvents(),this.target=this.config=null,super.destroy())}}return t.ScrollBar=e,t}({},LeaferUI,LeaferUI);
+this.LeaferIN=this.LeaferIN||{},this.LeaferIN.scroll=function(t,s){"use strict";class i extends s.Group{get isOutside(){return!0}constructor(t,i){super(),this.config={theme:"light",padding:0,minSize:10},t.isApp&&(t.sky.add(this),t=t.tree),this.target=t,i&&s.DataHelper.assign(this.config,i),this.changeTheme(this.config.theme),this.waitLeafer(this.__listenEvents,this)}changeTheme(t){let i;"string"==typeof t?(i={fill:"black",stroke:"rgba(255,255,255,0.8)"},"dark"===t&&(i.fill="white",i.stroke="rgba(0,0,0,0.2)")):i=t,this.scrollXBar||this.addMany(this.scrollXBar=new s.Box,this.scrollYBar=new s.Box),i=Object.assign({strokeAlign:"center",opacity:.5,width:6,cornerRadius:3,hoverStyle:{opacity:.6},pressStyle:{opacity:.7}},i),i.height||(i.height=i.width),this.scrollXBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.scrollYBar.set(Object.assign(Object.assign({},i),{visible:!1})),this.leafer&&this.update()}update(t){if(this.dragScrolling)return;const{minSize:i,padding:e}=this.config,{zoomLayer:r,canvas:h}=this.target.leafer,{worldRenderBounds:a}=r;if(t&&this.scrollBounds&&this.scrollBounds.isSame(a))return;this.scrollBounds=new s.Bounds(a);const n=h.bounds.clone().shrink(e),o=n.clone().add(a),l=this.ratioX=n.width/o.width,g=this.ratioY=n.height/o.height,d=(n.x-o.x)/o.width,c=(n.y-o.y)/o.height,u=l<1,v=g<1,{scrollXBar:f,scrollYBar:p}=this,{x:_,y:y,width:m,height:B}=n.shrink([2,v?p.width+6:2,u?f.height+6:2,2]);f.set({x:_+m*d,y:y+B+2,width:Math.max(m*l,i),visible:u}),p.set({x:_+m+2,y:y+B*c,height:Math.max(B*g,i),visible:v})}onDrag(t){this.dragScrolling=!0,this.__dragOut=this.app.config.move.dragOut,this.app.config.move.dragOut=!1;const s=t.current===this.scrollXBar,i=this.target.leafer.getValidMove(s?-t.moveX/this.ratioX:0,s?0:-t.moveY/this.ratioY);this.target.moveWorld(i.x,i.y),t.current.moveWorld(i.x&&-i.x*this.ratioX,i.y&&-i.y*this.ratioY)}onDragEnd(){this.dragScrolling=!1,this.app.config.move.dragOut=this.__dragOut}__listenEvents(){const{scrollXBar:t,scrollYBar:i}=this;this.__eventIds=[t.on_(s.DragEvent.DRAG,this.onDrag,this),i.on_(s.DragEvent.DRAG,this.onDrag,this),t.on_(s.DragEvent.END,this.onDragEnd,this),i.on_(s.DragEvent.END,this.onDragEnd,this),this.target.on_(s.RenderEvent.BEFORE,(()=>this.update(!0))),this.target.leafer.on_(s.ResizeEvent.RESIZE,(()=>this.update()))]}__removeListenEvents(){this.off_(this.__eventIds)}destroy(){this.destroyed||(this.__removeListenEvents(),this.target=this.config=null,super.destroy())}}return s.Plugin.add("scroll"),t.ScrollBar=i,t}({},LeaferUI);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-in/scroll",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "@leafer-in/scroll",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -34,9 +34,8 @@
     "leaferjs"
   ],
   "peerDependencies": {
-    "@leafer-ui/draw": "^1.1.2",
-    "@leafer-ui/core": "^1.1.2",
-    "@leafer-ui/interface": "^1.1.2",
-    "@leafer-in/interface": "^1.1.2"
+    "@leafer-ui/core": "^1.2.0",
+    "@leafer-ui/interface": "^1.2.0",
+    "@leafer-in/interface": "^1.2.0"
   }
 }

package/src/ScrollBar.ts

@@ -1,6 +1,5 @@
 import { IApp, IBounds, IBox, IBoxInputData, IEventListenerId, IGroup } from '@leafer-ui/interface'
-import { Group, RenderEvent, ResizeEvent, Box, Bounds, DataHelper } from '@leafer-ui/draw'
-import { DragEvent } from '@leafer-ui/core'
+import { Group, RenderEvent, ResizeEvent, Box, Bounds, DataHelper, DragEvent } from '@leafer-ui/core'
 
 import { IScrollBar, IScrollBarConfig, IScrollBarTheme } from '@leafer-in/interface'
 

package/src/index.ts

@@ -1 +1,5 @@
-export { ScrollBar } from './ScrollBar'
+export { ScrollBar } from './ScrollBar'
+
+import { Plugin } from '@leafer-ui/core'
+
+Plugin.add('scroll')

package/types/index.d.ts

@@ -1,6 +1,5 @@
 import { IGroup, IBox, IBounds, IEventListenerId } from '@leafer-ui/interface';
-import { Group } from '@leafer-ui/draw';
-import { DragEvent } from '@leafer-ui/core';
+import { Group, DragEvent } from '@leafer-ui/core';
 import { IScrollBar, IScrollBarConfig, IScrollBarTheme } from '@leafer-in/interface';
 
 declare class ScrollBar extends Group implements IScrollBar {