@applicaster/zapp-react-dom-app 13.0.0-alpha.7210171818 → 13.0.0-alpha.8263121071

package/App/InteractionManager/index.tsx

@@ -23,6 +23,8 @@ import {
 
 import { showConfirmationDialog } from "@applicaster/zapp-react-native-utils/alertUtils";
 
+import { withUseSeek } from "@applicaster/zapp-react-native-utils/reactHooks/player";
+
 import {
   DISPLAY_STATES,
   DisplayStateContext,
@@ -46,7 +48,6 @@ import {
 
 import { OnScreenKeyboard } from "@applicaster/zapp-react-dom-ui-components/Components/OnScreenKeyboard";
 import { KeyboardLongPressManager } from "@applicaster/zapp-react-dom-ui-components/Utils/KeyboardLongPressManager";
-import { KeyInputHandler } from "@applicaster/zapp-react-native-utils/appUtils/keyInputHandler/KeyInputHandler";
 
 const { withXray } = getXray();
 const globalAny: any = global;
@@ -61,6 +62,14 @@ type Props = {
   navigator: QuickBrickAppNavigator;
   rivers: {};
   xray: XRayContext;
+  seekMethods: {
+    onRewindPress: () => void;
+    onRewindLongPress: () => void;
+    onForwardPress: () => void;
+    onForwardLongPress: () => void;
+    onRewindPressOut: () => void;
+    onForwardPressOut: () => void;
+  };
   confirmDialog: typeof confirmationDialogStore;
 };
 
@@ -172,11 +181,6 @@ class InteractionManagerClass extends React.Component<Props, State> {
 
     window.addEventListener("onLongPress", this.handleLongPress.bind(this));
 
-    window.addEventListener(
-      "onPressRelease",
-      this.handleLongPressRelease.bind(this)
-    );
-
     window.addEventListener(
       "onLongPressRelease",
       this.handleLongPressRelease.bind(this)
@@ -335,39 +339,12 @@ class InteractionManagerClass extends React.Component<Props, State> {
   }
 
   onKeyUp(event: KeyboardEvent) {
-    const { setDisplayState } = this.props;
-
     if (this.keySupportsLongPress(event)) {
       this.longPressDetector.endKeyPressMonitoring(event.code);
     }
-
-    if (keyCode(event).matches(KEYS.Enter) || keyCode(event).matches(KEYS.X)) {
-      focusManager.pressOut();
-    }
-
-    if (
-      keyCode(event).matches(KEYS.Forward) ||
-      keyCode(event).matches(KEYS.C)
-    ) {
-      setDisplayState(DISPLAY_STATES.HUD);
-      KeyInputHandler.getInstance().onForwardPressOut();
-
-      return;
-    }
-
-    if (
-      keyCode(event).matches(KEYS.Rewind) ||
-      keyCode(event).matches(KEYS.Z)
-    ) {
-      setDisplayState(DISPLAY_STATES.HUD);
-      KeyInputHandler.getInstance().onRewindPressOut();
-    }
   }
 
   onKeyDown(event) {
-    console.log("Anton event", event);
-    // console.log("Anton: event", event);
-    // debugger;
     const { displayState, setDisplayState, navigator } = this.props;
     const { isKeyboardVisible } = this.state;
 
@@ -395,7 +372,6 @@ class InteractionManagerClass extends React.Component<Props, State> {
      When the player is displayed, we listen to Native Play / Pause / Stop
      buttons. Any other key press will display the transport controls
      */
-
     if (
       displayState === DISPLAY_STATES.PLAYER ||
       displayState === DISPLAY_STATES.HUD
@@ -428,22 +404,16 @@ class InteractionManagerClass extends React.Component<Props, State> {
         return;
       }
 
-      if (
-        keyCode(event).matches(KEYS.Forward) ||
-        keyCode(event).matches(KEYS.C)
-      ) {
+      if (keyCode(event).matches(KEYS.Forward)) {
         setDisplayState(DISPLAY_STATES.HUD);
-        KeyInputHandler.getInstance().onForwardPress();
+        this.props.seekMethods.onForwardPress();
 
         return;
       }
 
-      if (
-        keyCode(event).matches(KEYS.Rewind) ||
-        keyCode(event).matches(KEYS.Z)
-      ) {
+      if (keyCode(event).matches(KEYS.Rewind)) {
         setDisplayState(DISPLAY_STATES.HUD);
-        KeyInputHandler.getInstance().onRewindPress();
+        this.props.seekMethods.onRewindPress();
 
         return;
       }
@@ -503,7 +473,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
       }
     }
 
-    if (keyCode(event).matches(KEYS.Enter) || keyCode(event).matches(KEYS.X)) {
+    if (keyCode(event).matches(KEYS.Enter)) {
       if (displayState === DISPLAY_STATES.PLAYER) {
         setDisplayState(DISPLAY_STATES.HUD);
       } else {
@@ -729,18 +699,14 @@ class InteractionManagerClass extends React.Component<Props, State> {
 
     switch (keyCode) {
       case KEYS.Forward.code:
-      case KEYS.C.code:
-        // playbackState && KeyInputHandler.getInstance().onForwardLongPress();
-
+        playbackState && this.props.seekMethods.onForwardLongPress();
         break;
 
       case KEYS.Rewind.code:
-      case KEYS.Z.code:
-        // playbackState && KeyInputHandler.getInstance().onRewindLongPress();
+        playbackState && this.props.seekMethods.onRewindLongPress();
         break;
 
       case KEYS.Enter.code:
-      case KEYS.X.code:
         focusManager.longPress();
         break;
     }
@@ -750,35 +716,26 @@ class InteractionManagerClass extends React.Component<Props, State> {
     const { keyCode } = event.detail;
     this.longPressActive = false;
     this.resetHudTimeout();
-    // debugger;
 
     switch (keyCode) {
       case KEYS.Forward.code:
-      case KEYS.C.code:
-        // KeyInputHandler.getInstance().onForwardPressOut();
+        this.props.seekMethods.onForwardPressOut();
         break;
 
       case KEYS.Rewind.code:
-      case KEYS.Z.code:
-        // KeyInputHandler.getInstance().onRewindPressOut();
+        this.props.seekMethods.onRewindPressOut();
         break;
 
       case KEYS.Enter.code:
-      case KEYS.X.code:
-        // focusManager.pressOut();
+        focusManager.pressOut();
         break;
     }
   };
 
   private keySupportsLongPress(event: KeyboardEvent): boolean {
-    return [
-      KEYS.Forward.code,
-      KEYS.Rewind.code,
-      KEYS.Enter.code,
-      KEYS.Z.code,
-      KEYS.X.code,
-      KEYS.C.code,
-    ].includes(event.code);
+    return [KEYS.Forward.code, KEYS.Rewind.code, KEYS.Enter.code].includes(
+      event.code
+    );
   }
 
   render() {
@@ -797,6 +754,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
 
 export const InteractionManager = R.compose(
   withNavigator,
+  withUseSeek,
   withXray,
   connectToStore(R.pick(["rivers"])),
   PlayerContentContext.withConsumer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-dom-app",
-  "version": "13.0.0-alpha.7210171818",
+  "version": "13.0.0-alpha.8263121071",
   "description": "Zapp App Component for Applicaster's Quick Brick React Native App",
   "main": "index.js",
   "scripts": {
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/applicaster/zapp-react-dom-app#readme",
   "dependencies": {
-    "@applicaster/zapp-react-dom-ui-components": "13.0.0-alpha.7210171818",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.7210171818",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.7210171818",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.7210171818",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.7210171818",
+    "@applicaster/zapp-react-dom-ui-components": "13.0.0-alpha.8263121071",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.8263121071",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.8263121071",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.8263121071",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.8263121071",
     "abortcontroller-polyfill": "^1.7.5",
     "history": "^4.7.2",
     "react-router-dom": "^5.1.2",