@edv4h/usketch-plugin-viewport-nav 2.0.12 → 2.1.0

package/README.md

@@ -0,0 +1,55 @@
+# @edv4h/usketch-plugin-viewport-nav
+
+ビューポート操作（ズーム / パン）を提供するプラグイン。
+
+- **ズーム**: `Ctrl`/`Cmd` + ホイール（トラックパッドのピンチ含む）でカーソル位置を中心に拡大・縮小。
+- **パン**: ホイール（修飾キー無し）、および中ボタンドラッグ。
+
+## 使い方
+
+```ts
+import { createViewportNavPlugin } from "@edv4h/usketch-plugin-viewport-nav";
+
+// 既定（従来どおりの体感）
+createViewportNavPlugin();
+
+// ズーム感度を上げる
+createViewportNavPlugin({ zoomSensitivity: 2.5 });
+```
+
+## オプション
+
+```ts
+interface ViewportNavOptions {
+  /**
+   * ホイール/トラックパッドのズーム感度。`1` が既定で従来相当。
+   * 大きいほど 1 操作あたりの倍率変化が大きくなる（0.25〜3 にクランプ）。
+   * 値だけでなく「ライブに読む getter」も渡せる（設定 UI からの即時反映用）。
+   */
+  zoomSensitivity?: number | (() => number);
+}
+```
+
+### ズーム量の算出
+
+ズーム係数は `deltaY` の**大きさ**に比例する:
+
+```
+factor = exp(-deltaY * 0.001 * zoomSensitivity)
+```
+
+- 従来は `deltaY` の符号だけで `0.9 / 1.1` に固定していたため、小さい `deltaY` を大量に出す
+  トラックパッドのピンチと `deltaY≈±100` のマウスホイールとで体感速度が大きく異なっていた。
+  比例式にすることで両者の差が縮まり、ピンチも滑らかになる。
+- `zoomSensitivity` 省略時（=1）は `deltaY≈100` で `factor≈0.905`、`deltaY≈-100` で `≈1.105` と
+  なり、**従来の 0.9 / 1.1 とほぼ同じ**（後方互換）。
+
+### ライブ反映（getter 形式）
+
+設定 UI のスライダー等で感度を即時反映したい場合は getter を渡す。wheel イベントごとに評価される。
+
+```ts
+let zoomSensitivity = 1;
+createViewportNavPlugin({ zoomSensitivity: () => zoomSensitivity });
+// 以降 zoomSensitivity を書き換えれば次のズームから反映される
+```

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { createViewportNavPlugin } from "./plugin.js";
+export { createViewportNavPlugin, type ViewportNavOptions } from "./plugin.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAA2B,MAAM,aAAa,CAAC"}

package/dist/plugin.d.ts

@@ -1,3 +1,13 @@
 import type { UsketchPlugin } from "@edv4h/usketch-shared";
-export declare function createViewportNavPlugin(): UsketchPlugin;
+export interface ViewportNavOptions {
+    /**
+     * ホイール/トラックパッドのズーム感度。`1` が既定で従来相当。
+     * 大きいほど 1 操作あたりの倍率変化が大きくなる（{@link MIN_ZOOM_SENSITIVITY}〜{@link MAX_ZOOM_SENSITIVITY} にクランプ）。
+     *
+     * 設定 UI からの即時反映のため、値だけでなく「ライブに読む getter」も渡せる。
+     * getter は wheel イベントごとに評価される。
+     */
+    zoomSensitivity?: number | (() => number);
+}
+export declare function createViewportNavPlugin(options?: ViewportNavOptions): UsketchPlugin;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKX,aAAa,EACb,MAAM,uBAAuB,CAAC;AAE/B,wBAAgB,uBAAuB,IAAI,aAAa,CAwDvD"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKX,aAAa,EACb,MAAM,uBAAuB,CAAC;AAW/B,MAAM,WAAW,kBAAkB;IAClC;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;CAC1C;AASD,wBAAgB,uBAAuB,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,aAAa,CAyDnF"}

package/dist/plugin.js

@@ -1,4 +1,18 @@
-export function createViewportNavPlugin() {
+/** ホイール/トラックパッドのズーム係数の基準ステップ。
+ * 既定感度(=1)で deltaY≈100 → factor≈exp(-0.1)≈0.905、deltaY≈-100 → ≈1.105 となり、
+ * 従来の固定 0.9 / 1.1 とほぼ同じ体感になる。 */
+const ZOOM_STEP = 0.001;
+/** zoomSensitivity のクランプ範囲（極端な値で操作不能になるのを防ぐ）。 */
+const MIN_ZOOM_SENSITIVITY = 0.25;
+const MAX_ZOOM_SENSITIVITY = 3;
+/** number | (() => number) を解決し、有効な感度値へクランプする。 */
+function resolveZoomSensitivity(source) {
+    const raw = typeof source === "function" ? source() : source;
+    if (typeof raw !== "number" || !Number.isFinite(raw))
+        return 1;
+    return Math.min(MAX_ZOOM_SENSITIVITY, Math.max(MIN_ZOOM_SENSITIVITY, raw));
+}
+export function createViewportNavPlugin(options) {
     return {
         id: "usketch-plugin-viewport-nav",
         name: "ビューポートナビゲーション",
@@ -8,9 +22,10 @@ export function createViewportNavPlugin() {
             // ── Wheel: zoom & pan ──
             const offWheel = ctx.events.on("canvas:wheel", (event) => {
                 if (event.ctrlKey || event.metaKey) {
-                    // Zoom toward cursor
+                    // Zoom toward cursor — factor は deltaY の大きさに比例（トラックパッドのピンチも滑らか）
                     const viewport = ctx.store.getViewport();
-                    const factor = event.deltaY > 0 ? 0.9 : 1.1;
+                    const sensitivity = resolveZoomSensitivity(options?.zoomSensitivity);
+                    const factor = Math.exp(-event.deltaY * ZOOM_STEP * sensitivity);
                     ctx.store.zoomTo(viewport.zoom * factor, event.screenPoint);
                 }
                 else {

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,uBAAuB;IACtC,OAAO;QACN,EAAE,EAAE,6BAA6B;QACjC,IAAI,EAAE,eAAe;QAErB,KAAK,CAAC,GAAkB;YACvB,uDAAuD;YACvD,IAAI,cAAc,GAAgC,IAAI,CAAC;YAEvD,0BAA0B;YAC1B,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAmB,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1E,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBACpC,qBAAqB;oBACrB,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;oBACzC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;oBAC5C,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC7D,CAAC;qBAAM,CAAC;oBACP,MAAM;oBACN,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC/C,CAAC;YACF,CAAC,CAAC,CAAC;YAEH,yBAAyB;YACzB,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAqB,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvF,cAAc,GAAG;oBAChB,SAAS,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE;iBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAqB,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE;gBACxF,IAAI,CAAC,cAAc;oBAAE,OAAO;gBAE5B,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5D,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;gBAE5D,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAExB,cAAc,CAAC,SAAS,GAAG;oBAC1B,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;oBACtB,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;iBACtB,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAqB,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE;gBACrF,cAAc,GAAG,IAAI,CAAC;YACvB,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,EAAE;gBACX,QAAQ,EAAE,CAAC;gBACX,aAAa,EAAE,CAAC;gBAChB,cAAc,EAAE,CAAC;gBACjB,YAAY,EAAE,CAAC;gBACf,cAAc,GAAG,IAAI,CAAC;YACvB,CAAC,CAAC;QACH,CAAC;KACD,CAAC;AACH,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edv4h/usketch-plugin-viewport-nav",
-  "version": "2.0.12",
+  "version": "2.1.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,13 +12,13 @@
     }
   },
   "dependencies": {
-    "@edv4h/usketch-core": "2.4.1",
-    "@edv4h/usketch-shared": "4.11.0",
-    "@edv4h/usketch-store": "3.5.3"
+    "@edv4h/usketch-core": "2.4.2",
+    "@edv4h/usketch-shared": "4.12.0",
+    "@edv4h/usketch-store": "3.5.4"
   },
   "devDependencies": {
     "typescript": "7.0.2",
-    "vitest": "4.1.10"
+    "vitest": "4.1.11"
   },
   "publishConfig": {
     "access": "public"