From 1b9448c081fd457ccd59b06f44623cdcba5b5742 Mon Sep 17 00:00:00 2001 From: chenshenhai Date: Fri, 6 Aug 2021 15:10:22 +0800 Subject: [PATCH] refactor: rename scrollX/scrollY to scrollLeft/scrollTop --- .../core/examples/test/scale-003.html.jpg | Bin 41907 -> 24332 bytes packages/core/__tests__/lib/point.test.ts | 8 +++---- packages/core/examples/features/lib/main.js | 4 ++-- packages/core/examples/features/lib/scroll.js | 20 +++++++++--------- packages/core/examples/features/main.html | 8 +++---- packages/core/examples/test/scale-002.html | 4 ++-- packages/core/examples/test/scale-003.html | 6 +++--- packages/core/src/index.ts | 8 +++---- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/__tests__/snapshot/core/examples/test/scale-003.html.jpg b/__tests__/snapshot/core/examples/test/scale-003.html.jpg index 2f0d8af7e75a95fb99e9eb80571d5e5d55ce201a..2f342c578288d29f01dd3751b0aa3d92e35c2ebb 100644 GIT binary patch delta 16571 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 V|6?G5NTbyMzy7_FL2lU``#&$;7X<(S delta 34778 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 BDR~PRx&Bh1^Nww;(*o&yK3l(F_C0I( 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 diff --git a/packages/core/__tests__/lib/point.test.ts b/packages/core/__tests__/lib/point.test.ts index 7909632..fa1273c 100644 --- a/packages/core/__tests__/lib/point.test.ts +++ b/packages/core/__tests__/lib/point.test.ts @@ -15,15 +15,15 @@ describe('@idraw/core', () => { }; const transform = { scale: 2, - scrollX: -200, - scrollY: -100, + scrollLeft: 200, + scrollTop: 100, }; const mount = document.querySelector('#mount') as HTMLDivElement; const idraw = new IDraw(mount, opts); idraw.scale(transform.scale); - idraw.scrollX(transform.scrollX); - idraw.scrollY(transform.scrollY); + idraw.scrollLeft(transform.scrollLeft); + idraw.scrollTop(transform.scrollTop); const p1 = {x: 400, y: 300}; const p2 = {x: 300, y: 200}; diff --git a/packages/core/examples/features/lib/main.js b/packages/core/examples/features/lib/main.js index f9ca777..a2f8f5d 100644 --- a/packages/core/examples/features/lib/main.js +++ b/packages/core/examples/features/lib/main.js @@ -9,8 +9,8 @@ const mount = document.querySelector('#mount'); const defaultConf = { scale: 1.5, - scrollX: 0, - scrollY: 0, + scrollLeft: 100, + scrollTop: 50, }; const core = new Core(mount, { width: 600, diff --git a/packages/core/examples/features/lib/scroll.js b/packages/core/examples/features/lib/scroll.js index eb86d0a..1ed6c4d 100644 --- a/packages/core/examples/features/lib/scroll.js +++ b/packages/core/examples/features/lib/scroll.js @@ -1,31 +1,31 @@ -const inputX = document.querySelector('#scrollX'); -const inputY = document.querySelector('#scrollY'); +const inputX = document.querySelector('#scrollLeft'); +const inputY = document.querySelector('#scrollTop'); let hasInited = false; export function doScroll(core, conf = {}) { if (hasInited === true) return; if (!(inputY && inputX)) return; - if (conf.scrollX >= 0) { - inputX.value = conf.scrollX; - core.scrollX(conf.scrollX); + if (conf.scrollLeft >= 0) { + inputX.value = conf.scrollLeft; + core.scrollLeft(conf.scrollLeft); } - if (conf.scrollY >= 0) { - inputY.value = conf.scrollY; - core.scrollY(conf.scrollY); + if (conf.scrollTop >= 0) { + inputY.value = conf.scrollTop; + core.scrollTop(conf.scrollTop); } inputX.addEventListener('change', () => { const val = inputX.value * 1; if (val >= 0 || val < 0) { - core.scrollX(val); + core.scrollLeft(val); } }); inputY.addEventListener('change', () => { const val = inputY.value * 1; if (val >= 0 || val < 0) { - core.scrollY(val); + core.scrollTop(val); } }); hasInited = true; diff --git a/packages/core/examples/features/main.html b/packages/core/examples/features/main.html index 9c35813..0477be5 100644 --- a/packages/core/examples/features/main.html +++ b/packages/core/examples/features/main.html @@ -20,10 +20,10 @@
scale: - scrollX: - - scrollY: - + scrollLeft: + + scrollTop: +
diff --git a/packages/core/examples/test/scale-002.html b/packages/core/examples/test/scale-002.html index aa7ce3b..69c3e05 100644 --- a/packages/core/examples/test/scale-002.html +++ b/packages/core/examples/test/scale-002.html @@ -35,8 +35,8 @@ devicePixelRatio: 4 }); core.setData(data); - core.scrollX(-600); - core.scrollY(-400); + core.scrollLeft(600); + core.scrollTop(400); const result = core.scale(0.5); console.log('scale: ', result); diff --git a/packages/core/examples/test/scale-003.html b/packages/core/examples/test/scale-003.html index be68dbc..b752d76 100644 --- a/packages/core/examples/test/scale-003.html +++ b/packages/core/examples/test/scale-003.html @@ -34,10 +34,10 @@ devicePixelRatio: 4 }); core.setData(data); - core.scrollX(400); - core.scrollY(400); + core.scrollLeft(400); + core.scrollTop(400); const result = core.scale(0.8); - console.log('scale: ', result); + // console.log('scale: ', result); \ No newline at end of file diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 42fb996..b7baf32 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -154,15 +154,15 @@ class Core { return screen; } - scrollX(x: number): TypeScreenContext { - const screen = this[_board].scrollX(x); + scrollLeft(left: number): TypeScreenContext { + const screen = this[_board].scrollX(0 - left); this[_draw](); this[_emitChangeScreen](); return screen; } - scrollY(y: number): TypeScreenContext { - const screen = this[_board].scrollY(y); + scrollTop(top: number): TypeScreenContext { + const screen = this[_board].scrollY(0 - top); this[_draw](); this[_emitChangeScreen](); return screen;