@applicaster/zapp-react-dom-app 12.0.2-rc.0 → 13.0.0-alpha.1632352572

package/App/InteractionManager/index.tsx

@@ -23,8 +23,6 @@ import {
 
 import { showConfirmationDialog } from "@applicaster/zapp-react-native-utils/alertUtils";
 
-import { withUseSeek } from "@applicaster/zapp-react-native-utils/reactHooks/player";
-
 import {
   DISPLAY_STATES,
   DisplayStateContext,
@@ -48,6 +46,7 @@ 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;
@@ -62,14 +61,6 @@ type Props = {
   navigator: QuickBrickAppNavigator;
   rivers: {};
   xray: XRayContext;
-  seekMethods: {
-    onRewindPress: () => void;
-    onRewindLongPress: () => void;
-    onForwardPress: () => void;
-    onForwardLongPress: () => void;
-    onRewindPressOut: () => void;
-    onForwardPressOut: () => void;
-  };
   confirmDialog: typeof confirmationDialogStore;
 };
 
@@ -181,6 +172,11 @@ 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)
@@ -339,9 +335,32 @@ 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) ||
+      (__DEV__ && keyCode(event).matches(KEYS.X))) {
+      focusManager.pressOut();
+    }
+
+    if (
+      keyCode(event).matches(KEYS.Forward) ||
+      (__DEV__ && keyCode(event).matches(KEYS.C))
+    ) {
+      setDisplayState(DISPLAY_STATES.HUD);
+      KeyInputHandler.getInstance().onForwardPressOut();
+    }
+
+    if (
+      keyCode(event).matches(KEYS.Rewind) ||
+      (__DEV__ && keyCode(event).matches(KEYS.Z))
+    ) {
+      setDisplayState(DISPLAY_STATES.HUD);
+      KeyInputHandler.getInstance().onRewindPressOut();
+    }
   }
 
   onKeyDown(event) {
@@ -372,6 +391,7 @@ 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
@@ -404,16 +424,22 @@ class InteractionManagerClass extends React.Component<Props, State> {
         return;
       }
 
-      if (keyCode(event).matches(KEYS.Forward)) {
+      if (
+        keyCode(event).matches(KEYS.Forward) ||
+        (__DEV__ && keyCode(event).matches(KEYS.C))
+      ) {
         setDisplayState(DISPLAY_STATES.HUD);
-        this.props.seekMethods.onForwardPress();
+        KeyInputHandler.getInstance().onForwardPress();
 
         return;
       }
 
-      if (keyCode(event).matches(KEYS.Rewind)) {
+      if (
+        keyCode(event).matches(KEYS.Rewind) ||
+        (__DEV__ && keyCode(event).matches(KEYS.Z))
+      ) {
         setDisplayState(DISPLAY_STATES.HUD);
-        this.props.seekMethods.onRewindPress();
+        KeyInputHandler.getInstance().onRewindPress();
 
         return;
       }
@@ -473,7 +499,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
       }
     }
 
-    if (keyCode(event).matches(KEYS.Enter)) {
+    if (keyCode(event).matches(KEYS.Enter) || keyCode(event).matches(KEYS.X)) {
       if (displayState === DISPLAY_STATES.PLAYER) {
         setDisplayState(DISPLAY_STATES.HUD);
       } else {
@@ -688,6 +714,7 @@ class InteractionManagerClass extends React.Component<Props, State> {
     }, SEQUENCE_ENTRY_TIME);
   }
 
+  // TODO: Delete it on next PR if not needed
   private handleLongPress = (event: CustomEvent) => {
     const { keyCode } = event.detail;
     const { displayState } = this.props;
@@ -698,44 +725,36 @@ class InteractionManagerClass extends React.Component<Props, State> {
     this.cancelHudTimeout();
 
     switch (keyCode) {
-      case KEYS.Forward.code:
-        playbackState && this.props.seekMethods.onForwardLongPress();
-        break;
-
-      case KEYS.Rewind.code:
-        playbackState && this.props.seekMethods.onRewindLongPress();
-        break;
-
       case KEYS.Enter.code:
+      case KEYS.X.code:
         focusManager.longPress();
         break;
     }
   };
 
+  // TODO: Delete it on next PR if not needed
   private handleLongPressRelease = (event: CustomEvent) => {
     const { keyCode } = event.detail;
     this.longPressActive = false;
     this.resetHudTimeout();
 
     switch (keyCode) {
-      case KEYS.Forward.code:
-        this.props.seekMethods.onForwardPressOut();
-        break;
-
-      case KEYS.Rewind.code:
-        this.props.seekMethods.onRewindPressOut();
-        break;
-
       case KEYS.Enter.code:
-        focusManager.pressOut();
+      case KEYS.X.code:
+        // focusManager.pressOut();
         break;
     }
   };
 
   private keySupportsLongPress(event: KeyboardEvent): boolean {
-    return [KEYS.Forward.code, KEYS.Rewind.code, KEYS.Enter.code].includes(
-      event.code
-    );
+    return [
+      KEYS.Forward.code,
+      KEYS.Rewind.code,
+      KEYS.Enter.code,
+      KEYS.Z.code,
+      KEYS.X.code,
+      KEYS.C.code,
+    ].includes(event.code);
   }
 
   render() {
@@ -754,7 +773,6 @@ class InteractionManagerClass extends React.Component<Props, State> {
 
 export const InteractionManager = R.compose(
   withNavigator,
-  withUseSeek,
   withXray,
   connectToStore(R.pick(["rivers"])),
   PlayerContentContext.withConsumer,

package/App/Loader/SplashLoader.js

@@ -1,7 +1,7 @@
-// @flow
 /* global tizen */
 import * as React from "react";
 import * as R from "ramda";
+import PropTypes from "prop-types";
 
 import { connectToStore } from "@applicaster/zapp-react-native-redux";
 import { QUICK_BRICK_EVENTS } from "@applicaster/zapp-react-native-bridge/QuickBrick";
@@ -9,17 +9,12 @@ import { QUICK_BRICK_EVENTS } from "@applicaster/zapp-react-native-bridge/QuickB
 import { QuickBrickEvents } from "../../Polyfills/QuickBrickCommunicationModule";
 import { Splash } from "../Splash";
 
-type Props = {
-  appLaunched: boolean,
-  children: any,
-};
-
 const getAppLaunched = R.compose(
   R.assoc("appLaunched", R.__, {}),
   R.path(["appState", "appLaunched"])
 );
 
-class SplashHandler extends React.Component<Props> {
+class SplashHandler extends React.Component {
   constructor(props) {
     super(props);
 
@@ -76,6 +71,12 @@ class SplashHandler extends React.Component<Props> {
   }
 }
 
+SplashHandler.propTypes = {
+  appLaunched: PropTypes.bool.isRequired,
+  children: PropTypes.node.isRequired,
+};
+
+SplashHandler.shouldShowSplash = true;
 SplashHandler.shouldShowSplash = true;
 
 export const SplashLoader = connectToStore(getAppLaunched)(SplashHandler);

package/App/Loader/loadSessionStorageData.js

@@ -1,4 +1,3 @@
-// @flow
 import * as R from "ramda";
 import { NativeModules } from "react-native";
 import uuidv4 from "uuid/v4";

package/App/Loader/utils/platform.js

@@ -1,4 +1,3 @@
-// @flow
 /* global webOS */
 /* global tizen */
 /* eslint-disable no-console */

package/App/Router/index.js

@@ -1,18 +1,17 @@
-// @flow
-
 import React from "react";
+import PropTypes from "prop-types";
 
 import { Router } from "react-router";
 import { createMemoryHistory } from "history";
 
-type Props = {
-  children: any,
-};
-
 const history = createMemoryHistory();
 
-export const ZappDomRouter = ({ children, ...otherProps }: Props) => (
+export const ZappDomRouter = ({ children, ...otherProps }) => (
   <Router history={history} {...otherProps}>
     {children}
   </Router>
 );
+
+ZappDomRouter.propTypes = {
+  children: PropTypes.node.isRequired,
+};

package/App/Splash/Spinner.js

@@ -1,4 +1,3 @@
-// @flow
 import React from "react";
 
 import "./spinner-styles.css";

package/App/Splash/Splash.js

@@ -1,13 +1,10 @@
-// @flow
 import React from "react";
 
-import { verifyAssets } from "@applicaster/zapp-react-dom-ui-components/Helpers/protectHelper";
+import PropTypes from "prop-types";
 
-type Props = {
-  remoteConfigurations: any,
-};
+import { verifyAssets } from "@applicaster/zapp-react-dom-ui-components/Helpers/protectHelper";
 
-export const SplashComponent = ({ remoteConfigurations }: Props) => {
+export const SplashComponent = ({ remoteConfigurations }) => {
   const image = verifyAssets(remoteConfigurations.assets, [
     "universal",
     "splash",
@@ -19,3 +16,9 @@ export const SplashComponent = ({ remoteConfigurations }: Props) => {
     </div>
   );
 };
+
+SplashComponent.propTypes = {
+  remoteConfigurations: PropTypes.shape({
+    assets: PropTypes.object.isRequired,
+  }).isRequired,
+};

package/Polyfills/Storage/index.js

@@ -1,4 +1,3 @@
-// @flow
 import * as R from "ramda";
 
 import {
@@ -7,11 +6,11 @@ import {
 } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { mapKeys } from "@applicaster/zapp-react-native-utils/objectUtils";
 
-export type StorageI = {
-  setItem: (string, string, ?string) => Promise<any>,
-  getItem: (string, ?string) => Promise<any>,
-  getAllItems: () => Promise<any>,
-};
+// export type StorageI = {
+//   setItem: (string, string, ?string) => Promise<any>,
+//   getItem: (string, ?string) => Promise<any>,
+//   getAllItems: () => Promise<any>,
+// };
 
 export const STORAGE_TYPES = ["localStorage", "sessionStorage"];
 
@@ -25,10 +24,7 @@ const NAMESPACE_SEPARATOR = "_::_";
  * @param {?String} namespace
  * @returns {String}
  */
-export function applyNamespaceToKeyName(
-  key: string,
-  namespace: ?string
-): string {
+export function applyNamespaceToKeyName(key, namespace) {
   return namespace ? `${namespace}${NAMESPACE_SEPARATOR}${key}` : key;
 }
 
@@ -40,7 +36,7 @@ export function applyNamespaceToKeyName(
  * @param {Function} fn function to run
  * @returns {Promise}
  */
-function tryAndResolve(fn: (any) => any): Promise<any> {
+function tryAndResolve(fn) {
   try {
     return R.compose(
       (value) => Promise.resolve(value),
@@ -62,7 +58,7 @@ function tryAndResolve(fn: (any) => any): Promise<any> {
  * @returns {Function} storageObject.callMethod: invokes methods on the storage object
  * @returns {Function} storageObject.getKeys: returns all existing keys in the storage object
  */
-function getStorageObject(type: string): (any) => void | Promise<any> {
+function getStorageObject(type) {
   const storage = R.prop(type, window);
 
   if (!R.includes(type, STORAGE_TYPES) || !storage) {
@@ -80,7 +76,7 @@ function getStorageObject(type: string): (any) => void | Promise<any> {
    * @param {Array} args array of arguments to use when invoking the method
    * @returns response of the method call
    */
-  function callMethod(method: string, ...args: [any]): Promise<any> {
+  function callMethod(method, ...args) {
     return storage[method](...args);
   }
 
@@ -107,9 +103,9 @@ function getStorageObject(type: string): (any) => void | Promise<any> {
 /**
  * returns an object to interact with a storage module (localStorage or sessionStorage)
  * @param {String} type of storage
- * @returns {Object}
+ * @returns {StorageI}
  */
-export function getStorageModule(type: string): StorageI {
+export function getStorageModule(type) {
   const Storage = getStorageObject(type);
 
   /**
@@ -120,11 +116,7 @@ export function getStorageModule(type: string): StorageI {
    * @param {?String} namespace
    * @returns {Promise<Boolean|Error>}
    */
-  function setItem(
-    key: string,
-    value: string,
-    namespace: ?string = DEFAULT_NAMESPACE
-  ): Promise<boolean | Error> {
+  function setItem(key, value, namespace = DEFAULT_NAMESPACE) {
     const keyName = applyNamespaceToKeyName(
       key,
       namespace || DEFAULT_NAMESPACE
@@ -144,10 +136,7 @@ export function getStorageModule(type: string): StorageI {
    * @param {?String} namespace
    * @returns {Promise<Any|Error>}
    */
-  function getItem(
-    key: string,
-    namespace: ?string = DEFAULT_NAMESPACE
-  ): Promise<any> {
+  function getItem(key, namespace = DEFAULT_NAMESPACE) {
     const keyName = applyNamespaceToKeyName(
       key,
       namespace || DEFAULT_NAMESPACE
@@ -163,7 +152,7 @@ export function getStorageModule(type: string): StorageI {
    * @param {?String} namespace
    * @returns {Promise<Boolean|Error>}
    */
-  function removeItem(key: string, namespace = DEFAULT_NAMESPACE) {
+  function removeItem(key, namespace = DEFAULT_NAMESPACE) {
     const keyName = applyNamespaceToKeyName(key, namespace);
 
     return tryAndResolve(() => Storage.callMethod("removeItem", keyName));
@@ -174,7 +163,7 @@ export function getStorageModule(type: string): StorageI {
    * @param {?String} namespace
    * @returns {Promise<Object|Error>}
    */
-  function getAllItems(namespace: ?string = null): Promise<string> {
+  function getAllItems(namespace = null) {
     return tryAndResolve(() => {
       const keys = Storage.getKeys();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-dom-app",
-  "version": "12.0.2-rc.0",
+  "version": "13.0.0-alpha.1632352572",
   "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": "12.0.2-rc.0",
-    "@applicaster/zapp-react-native-bridge": "12.0.2-rc.0",
-    "@applicaster/zapp-react-native-redux": "12.0.2-rc.0",
-    "@applicaster/zapp-react-native-ui-components": "12.0.2-rc.0",
-    "@applicaster/zapp-react-native-utils": "12.0.2-rc.0",
+    "@applicaster/zapp-react-dom-ui-components": "13.0.0-alpha.1632352572",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.1632352572",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.1632352572",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.1632352572",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.1632352572",
     "abortcontroller-polyfill": "^1.7.5",
     "history": "^4.7.2",
     "react-router-dom": "^5.1.2",