react-pixi-fiber 1.0.4 → 1.0.6

package/index.d.ts

@@ -12,7 +12,13 @@ declare module "react-pixi-fiber" {
   // shipped in pixi.js@5.3.0. We want to support earlier versions of PixiJS as well so we need this hack for now.
   // @ts-ignore TS2694
   type InteractionCompatibility = Exclude<keyof typeof PIXI.interaction, number | symbol>;
-  type InteractionEvent = string extends InteractionCompatibility
+  // Returns either real keys of `PIXI.InteractionEvent` (if it exists) or generic `string` (if it doesn't exist).
+  // `PIXI.InteractionEvent` was removed in pixi.js@7.0.0.
+  // @ts-ignore TS2694
+  type InteractionEventCompatibility = Exclude<keyof typeof PIXI.InteractionEvent, number | symbol>;
+  type InteractionEvent = string extends InteractionEventCompatibility
+    ? never
+    : string extends InteractionCompatibility
     // @ts-ignore TS2694
     ? PIXI.InteractionEvent
     // @ts-ignore TS2694
@@ -99,7 +105,12 @@ declare module "react-pixi-fiber" {
    */
 
   // Extra properties to add to allow us to set event handlers using props.
-  export type InteractiveComponent = { [P in InteractionEventTypes]?: (event: InteractionEvent) => void };
+  export type InteractiveComponent =
+    InteractionEvent extends never
+    // pixi.js >= 7
+    ? { }
+    // pixi.js <= 6
+    : { [P in InteractionEventTypes]?: (event: InteractionEvent) => void };
 
   /**
    * Base components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-pixi-fiber",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "React Fiber renderer for PixiJS",
   "main": "index.js",
   "umd:main": "index.umd.js",

package/src/PixiProperty.js

@@ -167,6 +167,7 @@ export const customProperties = {};
 });
 
 [
+  // pixi.js < 7.0
   "added",
   "click",
   "mousedown",
@@ -194,6 +195,37 @@ export const customProperties = {};
   "touchendoutside",
   "touchmove",
   "touchstart",
+  // pixi.js >= 7.1
+  "onclick",
+  "onmousedown",
+  "onmouseenter",
+  "onmouseleave",
+  "onmousemove",
+  "onmouseout",
+  "onmouseover",
+  "onmouseup",
+  "onmouseupoutside",
+  "onpointercancel",
+  "onpointerdown",
+  "onpointerenter",
+  "onpointerleave",
+  "onpointermove",
+  "onpointerout",
+  "onpointerover",
+  "onpointertap",
+  "onpointerup",
+  "onpointerupoutside",
+  "onrightclick",
+  "onrightdown",
+  "onrightup",
+  "onrightupoutside",
+  "ontap",
+  "ontouchcancel",
+  "ontouchend",
+  "ontouchendoutside",
+  "ontouchmove",
+  "ontouchstart",
+  "onwheel",
 ].forEach(name => {
   properties[name] = new PropertyInfoRecord(name, CALLBACK);
 });

package/src/possibleStandardNames.js

@@ -3,6 +3,7 @@ import { TYPES } from "./types";
 
 // http://pixijs.download/release/docs/PIXI.DisplayObject.html
 const eventsStandardNames = {
+  // pixi.js < 7.0
   added: "added",
   click: "click",
   mousedown: "mousedown",
@@ -30,6 +31,37 @@ const eventsStandardNames = {
   touchendoutside: "touchendoutside",
   touchmove: "touchmove",
   touchstart: "touchstart",
+  // pixi.js >= 7.1
+  onclick: "onclick",
+  onmousedown: "onmousedown",
+  onmouseenter: "onmouseenter",
+  onmouseleave: "onmouseleave",
+  onmousemove: "onmousemove",
+  onmouseout: "onmouseout",
+  onmouseover: "onmouseover",
+  onmouseup: "onmouseup",
+  onmouseupoutside: "onmouseupoutside",
+  onpointercancel: "onpointercancel",
+  onpointerdown: "onpointerdown",
+  onpointerenter: "onpointerenter",
+  onpointerleave: "onpointerleave",
+  onpointermove: "onpointermove",
+  onpointerout: "onpointerout",
+  onpointerover: "onpointerover",
+  onpointertap: "onpointertap",
+  onpointerup: "onpointerup",
+  onpointerupoutside: "onpointerupoutside",
+  onrightclick: "onrightclick",
+  onrightdown: "onrightdown",
+  onrightup: "onrightup",
+  onrightupoutside: "onrightupoutside",
+  ontap: "ontap",
+  ontouchcancel: "ontouchcancel",
+  ontouchend: "ontouchend",
+  ontouchendoutside: "ontouchendoutside",
+  ontouchmove: "ontouchmove",
+  ontouchstart: "ontouchstart",
+  onwheel: "onwheel",
 };
 
 // http://pixijs.download/release/docs/PIXI.DisplayObject.html

package/umd/react-pixi-fiber.development.js

@@ -455,6 +455,7 @@
   var _possibleStandardName;
 
   var eventsStandardNames = {
+    // pixi.js < 7.0
     added: "added",
     click: "click",
     mousedown: "mousedown",
@@ -481,7 +482,38 @@
     touchend: "touchend",
     touchendoutside: "touchendoutside",
     touchmove: "touchmove",
-    touchstart: "touchstart"
+    touchstart: "touchstart",
+    // pixi.js >= 7.1
+    onclick: "onclick",
+    onmousedown: "onmousedown",
+    onmouseenter: "onmouseenter",
+    onmouseleave: "onmouseleave",
+    onmousemove: "onmousemove",
+    onmouseout: "onmouseout",
+    onmouseover: "onmouseover",
+    onmouseup: "onmouseup",
+    onmouseupoutside: "onmouseupoutside",
+    onpointercancel: "onpointercancel",
+    onpointerdown: "onpointerdown",
+    onpointerenter: "onpointerenter",
+    onpointerleave: "onpointerleave",
+    onpointermove: "onpointermove",
+    onpointerout: "onpointerout",
+    onpointerover: "onpointerover",
+    onpointertap: "onpointertap",
+    onpointerup: "onpointerup",
+    onpointerupoutside: "onpointerupoutside",
+    onrightclick: "onrightclick",
+    onrightdown: "onrightdown",
+    onrightup: "onrightup",
+    onrightupoutside: "onrightupoutside",
+    ontap: "ontap",
+    ontouchcancel: "ontouchcancel",
+    ontouchend: "ontouchend",
+    ontouchendoutside: "ontouchendoutside",
+    ontouchmove: "ontouchmove",
+    ontouchstart: "ontouchstart",
+    onwheel: "onwheel"
   }; // http://pixijs.download/release/docs/PIXI.DisplayObject.html
 
   var displayObjectStandardNames = _objectSpread2(_objectSpread2({}, eventsStandardNames), {}, {
@@ -829,7 +861,9 @@
   ["anchor", "pivot", "position", "scale", "skew", "tilePosition", "tileScale"].forEach(function (name) {
     properties[name] = new PropertyInfoRecord(name, VECTOR);
   });
-  ["added", "click", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup", "mouseupoutside", "pointercancel", "pointerdown", "pointermove", "pointerout", "pointerover", "pointertap", "pointerup", "pointerupoutside", "removed", "rightclick", "rightdown", "rightup", "rightupoutside", "tap", "touchcancel", "touchend", "touchendoutside", "touchmove", "touchstart"].forEach(function (name) {
+  [// pixi.js < 7.0
+  "added", "click", "mousedown", "mousemove", "mouseout", "mouseover", "mouseup", "mouseupoutside", "pointercancel", "pointerdown", "pointermove", "pointerout", "pointerover", "pointertap", "pointerup", "pointerupoutside", "removed", "rightclick", "rightdown", "rightup", "rightupoutside", "tap", "touchcancel", "touchend", "touchendoutside", "touchmove", "touchstart", // pixi.js >= 7.1
+  "onclick", "onmousedown", "onmouseenter", "onmouseleave", "onmousemove", "onmouseout", "onmouseover", "onmouseup", "onmouseupoutside", "onpointercancel", "onpointerdown", "onpointerenter", "onpointerleave", "onpointermove", "onpointerout", "onpointerover", "onpointertap", "onpointerup", "onpointerupoutside", "onrightclick", "onrightdown", "onrightup", "onrightupoutside", "ontap", "ontouchcancel", "ontouchend", "ontouchendoutside", "ontouchmove", "ontouchstart", "onwheel"].forEach(function (name) {
     properties[name] = new PropertyInfoRecord(name, CALLBACK);
   });