@flighthq/interaction 0.3.0-next.1566.dcdf1d3 → 0.3.0-next.1584.a68fe91

package/dist/registerDefaultHitTests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerDefaultHitTests.d.ts","sourceRoot":"","sources":["../src/registerDefaultHitTests.ts"],"names":[],"mappings":"AA4BA,wBAAgB,uBAAuB,IAAI,IAAI,CAW9C"}
+{"version":3,"file":"registerDefaultHitTests.d.ts","sourceRoot":"","sources":["../src/registerDefaultHitTests.ts"],"names":[],"mappings":"AA6BA,wBAAgB,uBAAuB,IAAI,IAAI,CAY9C"}

package/dist/registerDefaultHitTests.js

@@ -1,4 +1,4 @@
-import { DisplayObjectKind, HtmlViewKind, MovieClipKind, QuadBatchKind, RichTextKind, Scale9ShapeKind, ShapeKind, SpriteKind, TextLabelKind, TilemapKind, } from '@flighthq/types/contract';
+import { DisplayObjectKind, HtmlViewKind, MorphShapeKind, MovieClipKind, QuadBatchKind, RichTextKind, Scale9ShapeKind, ShapeKind, SpriteKind, TextLabelKind, TilemapKind, } from '@flighthq/types/contract';
 import { defaultNode2DHitTestHandler, defaultHtmlViewHitTestHandler, defaultMovieClipHitTestHandler, defaultRichTextHitTestHandler, defaultShapeHitTestHandler, defaultTextHitTestHandler, } from './displayHitTests';
 import { registerHitTest } from './hitTests';
 import { defaultQuadBatchHitTestHandler, defaultSpriteHitTestHandler, defaultTilemapHitTestHandler, } from './spriteHitTests';
@@ -6,6 +6,7 @@ export function registerDefaultHitTests() {
     registerHitTest(DisplayObjectKind, defaultNode2DHitTestHandler);
     registerHitTest(HtmlViewKind, defaultHtmlViewHitTestHandler);
     registerHitTest(MovieClipKind, defaultMovieClipHitTestHandler);
+    registerHitTest(MorphShapeKind, defaultShapeHitTestHandler);
     registerHitTest(QuadBatchKind, defaultQuadBatchHitTestHandler);
     registerHitTest(RichTextKind, defaultRichTextHitTestHandler);
     registerHitTest(Scale9ShapeKind, defaultShapeHitTestHandler);

package/dist/registerDefaultHitTests.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerDefaultHitTests.js","sourceRoot":"","sources":["../src/registerDefaultHitTests.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,aAAa,EACb,aAAa,EACb,YAAY,EACZ,eAAe,EACf,SAAS,EACT,UAAU,EACV,aAAa,EACb,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,EAC7B,8BAA8B,EAC9B,6BAA6B,EAC7B,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,UAAU,uBAAuB;IACrC,eAAe,CAAC,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;IAChE,eAAe,CAAC,YAAY,EAAE,6BAA6B,CAAC,CAAC;IAC7D,eAAe,CAAC,aAAa,EAAE,8BAA8B,CAAC,CAAC;IAC/D,eAAe,CAAC,aAAa,EAAE,8BAA8B,CAAC,CAAC;IAC/D,eAAe,CAAC,YAAY,EAAE,6BAA6B,CAAC,CAAC;IAC7D,eAAe,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;IAC7D,eAAe,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC;IACvD,eAAe,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;IACzD,eAAe,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;IAC1D,eAAe,CAAC,WAAW,EAAE,4BAA4B,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"registerDefaultHitTests.js","sourceRoot":"","sources":["../src/registerDefaultHitTests.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,cAAc,EACd,aAAa,EACb,aAAa,EACb,YAAY,EACZ,eAAe,EACf,SAAS,EACT,UAAU,EACV,aAAa,EACb,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,EAC7B,8BAA8B,EAC9B,6BAA6B,EAC7B,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC3B,4BAA4B,GAC7B,MAAM,kBAAkB,CAAC;AAE1B,MAAM,UAAU,uBAAuB;IACrC,eAAe,CAAC,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;IAChE,eAAe,CAAC,YAAY,EAAE,6BAA6B,CAAC,CAAC;IAC7D,eAAe,CAAC,aAAa,EAAE,8BAA8B,CAAC,CAAC;IAC/D,eAAe,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;IAC5D,eAAe,CAAC,aAAa,EAAE,8BAA8B,CAAC,CAAC;IAC/D,eAAe,CAAC,YAAY,EAAE,6BAA6B,CAAC,CAAC;IAC7D,eAAe,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;IAC7D,eAAe,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC;IACvD,eAAe,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;IACzD,eAAe,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC;IAC1D,eAAe,CAAC,WAAW,EAAE,4BAA4B,CAAC,CAAC;AAC7D,CAAC"}

package/dist/registerShapeHitTest.d.ts

@@ -1,7 +1,7 @@
 /**
- * Opt-in exact hit provider for shapes: the `*Precise` queries then hit a Shape/Scale9Shape only where
- * the point falls inside actual filled geometry (winding), not the bounding box. The coarse queries and
- * `registerDefaultHitTests` are unaffected.
+ * Opt-in exact hit provider for shapes: the `*Precise` queries then hit a Shape/MorphShape/Scale9Shape
+ * only where the point falls inside actual filled geometry (winding), not the bounding box. The coarse
+ * queries and `registerDefaultHitTests` are unaffected.
  *
  * Importing this module is the opt-in — it pulls `@flighthq/shape` + `@flighthq/path`, so the base
  * interaction bundle stays free of them (tree-shaken unless referenced).

package/dist/registerShapeHitTest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerShapeHitTest.d.ts","sourceRoot":"","sources":["../src/registerShapeHitTest.ts"],"names":[],"mappings":"AASA;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAG3C"}
+{"version":3,"file":"registerShapeHitTest.d.ts","sourceRoot":"","sources":["../src/registerShapeHitTest.ts"],"names":[],"mappings":"AASA;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAI3C"}

package/dist/registerShapeHitTest.js

@@ -2,17 +2,18 @@ import { inverseMatrixTransformPointXY } from '@flighthq/geometry/contract';
 import { getNodeWorldMatrix } from '@flighthq/node/contract';
 import { containsPathPoint } from '@flighthq/path/contract';
 import { getShapeFillRegions } from '@flighthq/shape/contract';
-import { Scale9ShapeKind, ShapeKind } from '@flighthq/types/contract';
+import { MorphShapeKind, Scale9ShapeKind, ShapeKind } from '@flighthq/types/contract';
 import { registerHitTestPrecise } from './hitTests';
 /**
- * Opt-in exact hit provider for shapes: the `*Precise` queries then hit a Shape/Scale9Shape only where
- * the point falls inside actual filled geometry (winding), not the bounding box. The coarse queries and
- * `registerDefaultHitTests` are unaffected.
+ * Opt-in exact hit provider for shapes: the `*Precise` queries then hit a Shape/MorphShape/Scale9Shape
+ * only where the point falls inside actual filled geometry (winding), not the bounding box. The coarse
+ * queries and `registerDefaultHitTests` are unaffected.
  *
  * Importing this module is the opt-in — it pulls `@flighthq/shape` + `@flighthq/path`, so the base
  * interaction bundle stays free of them (tree-shaken unless referenced).
  */
 export function registerShapeHitTest() {
+    registerHitTestPrecise(MorphShapeKind, hitTestShapeFill);
     registerHitTestPrecise(ShapeKind, hitTestShapeFill);
     registerHitTestPrecise(Scale9ShapeKind, hitTestShapeFill);
 }

package/dist/registerShapeHitTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerShapeHitTest.js","sourceRoot":"","sources":["../src/registerShapeHitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB;IAClC,sBAAsB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACpD,sBAAsB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAC5D,CAAC;AAED,gGAAgG;AAChG,SAAS,gBAAgB,CAAC,MAAe,EAAE,CAAS,EAAE,CAAS;IAC7D,MAAM,OAAO,GAAG,mBAAmB,CAAE,MAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,CAAC,CAAC,CAAC;IAEhC,6BAA6B,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,MAAgB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,MAAM,sBAAsB,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC"}
+{"version":3,"file":"registerShapeHitTest.js","sourceRoot":"","sources":["../src/registerShapeHitTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB;IAClC,sBAAsB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IACzD,sBAAsB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACpD,sBAAsB,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;AAC5D,CAAC;AAED,gGAAgG;AAChG,SAAS,gBAAgB,CAAC,MAAe,EAAE,CAAS,EAAE,CAAS;IAC7D,MAAM,OAAO,GAAG,mBAAmB,CAAE,MAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,CAAC,CAAC,CAAC;IAEhC,6BAA6B,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,MAAgB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,MAAM,sBAAsB,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/interaction",
-  "version": "0.3.0-next.1566.dcdf1d3",
+  "version": "0.3.0-next.1584.a68fe91",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -36,18 +36,18 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/geometry": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/node": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/scene2d": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/log": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/path": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/shape": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/spatial": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/signals": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/bitmap": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/text": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/textlayout": "0.3.0-next.1566.dcdf1d3",
-    "@flighthq/types": "0.3.0-next.1566.dcdf1d3"
+    "@flighthq/geometry": "0.3.0-next.1584.a68fe91",
+    "@flighthq/node": "0.3.0-next.1584.a68fe91",
+    "@flighthq/scene2d": "0.3.0-next.1584.a68fe91",
+    "@flighthq/log": "0.3.0-next.1584.a68fe91",
+    "@flighthq/path": "0.3.0-next.1584.a68fe91",
+    "@flighthq/shape": "0.3.0-next.1584.a68fe91",
+    "@flighthq/spatial": "0.3.0-next.1584.a68fe91",
+    "@flighthq/signals": "0.3.0-next.1584.a68fe91",
+    "@flighthq/bitmap": "0.3.0-next.1584.a68fe91",
+    "@flighthq/text": "0.3.0-next.1584.a68fe91",
+    "@flighthq/textlayout": "0.3.0-next.1584.a68fe91",
+    "@flighthq/types": "0.3.0-next.1584.a68fe91"
   },
   "devDependencies": {
     "@flighthq/quadbatch": "*",

package/src/registerDefaultHitTests.test.ts

@@ -1,7 +1,7 @@
 import { setRectangle } from '@flighthq/geometry/contract';
 import { getNodeLocalBoundsRectangle } from '@flighthq/node/contract';
 import { createSprite, createScene2D } from '@flighthq/scene2d/contract';
-import { createShape } from '@flighthq/shape/contract';
+import { createMorphShape, createShape } from '@flighthq/shape/contract';
 
 import { findGraphHitTarget } from './hitTests';
 import { setNodeHitTestEnabled } from './nodeInteractionState';
@@ -20,6 +20,11 @@ describe('registerDefaultHitTests', () => {
     setRectangle(getNodeLocalBoundsRectangle(shape), 0, 0, 100, 100);
     setNodeHitTestEnabled(shape, true);
     expect(findGraphHitTarget(shape, 50, 50)).toBe(shape);
+
+    const morphShape = createMorphShape({ commands: [], endData: [], startData: [], winding: 'nonZero' });
+    setRectangle(getNodeLocalBoundsRectangle(morphShape), 0, 0, 100, 100);
+    setNodeHitTestEnabled(morphShape, true);
+    expect(findGraphHitTarget(morphShape, 50, 50)).toBe(morphShape);
   });
 
   it('containers return null for self hit', () => {

package/src/registerShapeHitTest.test.ts

@@ -1,13 +1,41 @@
 import { setRectangle } from '@flighthq/geometry/contract';
 import { getNodeLocalBoundsRectangle } from '@flighthq/node/contract';
-import { appendShapeBeginFill, appendShapeCircle, appendShapeEndFill, createShape } from '@flighthq/shape/contract';
-import { ShapeKind } from '@flighthq/types/contract';
+import { appendPathCircle, appendPathRectangle, createPath, createPathMorph } from '@flighthq/path/contract';
+import {
+  appendMorphShapePath,
+  appendShapeBeginFill,
+  appendShapeCircle,
+  appendShapeEndFill,
+  createMorphShape,
+  createShape,
+  setMorphShapeProgress,
+} from '@flighthq/shape/contract';
+import { MorphShapeKind, ShapeKind } from '@flighthq/types/contract';
 
 import { findGraphHitTargetPrecise, hitTestGraphLocalBounds, hitTestGraphPoint, registerHitTest } from './hitTests';
 import { setNodeHitTestEnabled } from './nodeInteractionState';
 import { registerShapeHitTest } from './registerShapeHitTest';
 
 describe('registerShapeHitTest', () => {
+  it('winding-tests the MorphShape live sample for precise queries', () => {
+    registerHitTest(MorphShapeKind, hitTestGraphLocalBounds);
+    registerShapeHitTest();
+    const start = createPath();
+    appendPathCircle(start, 50, 50, 40);
+    const end = createPath();
+    appendPathRectangle(end, 10, 10, 80, 80);
+    const shape = createMorphShape(createPathMorph(start, end)!);
+    appendShapeBeginFill(shape, 0xff0000ff, 1);
+    appendMorphShapePath(shape);
+    appendShapeEndFill(shape);
+    setRectangle(getNodeLocalBoundsRectangle(shape), 10, 10, 80, 80);
+    setNodeHitTestEnabled(shape, true);
+
+    expect(findGraphHitTargetPrecise(shape, 85, 85)).toBeNull();
+    setMorphShapeProgress(shape, 1);
+    expect(findGraphHitTargetPrecise(shape, 85, 85)).toBe(shape);
+  });
+
   it('winding-tests the actual fill for precise queries, so a bbox corner outside the circle misses', () => {
     registerHitTest(ShapeKind, hitTestGraphLocalBounds);
     registerShapeHitTest();