merge with release/1.0

lerna.json

@@ -17,4 +17,4 @@
       ]
     }
   }
-}
+}

packages/app-harness/metadata.json

@@ -3,4 +3,4 @@
     "version": "1.1.0-alpha.0",
     "identifier": "io.flexn.app.harness",
     "icon": "./static/icon.png"
-}
+}

packages/app-harness/package.json

@@ -107,4 +107,4 @@
     "browserslist": [
         "> 1%"
     ]
-}
+}

packages/app-harness/renative.json

@@ -38,4 +38,4 @@
         }
     },
     "workspaceID": "flexn"
-}
+}

packages/create/package.json

@@ -9,7 +9,7 @@
         "clean": "rm -rf ./lib && rm -rf tsconfig.tsbuildinfo",
         "compile": "tsc -b tsconfig.json",
         "watch": "tsc --watch --preserveWatchOutput",
-        "postinstall": "sh tools/overrideRNScrollView.sh"
+        "postinstall": "bash tools/overrideRNScrollView.sh"
     },
     "files": [
         "lib",
@@ -52,4 +52,4 @@
         "react": "*",
         "react-native": ">= 0.67.2"
     }
-}
+}

packages/create/src/focusManager/types.ts

@@ -9,6 +9,7 @@ import type {
     ColorValue,
     View as RNView,
 } from 'react-native';
+import type { MouseEvent, PointerEvent } from 'react';
 import type { FlashListProps as FLProps, ListRenderItemInfo } from '@flexn/shopify-flash-list';
 
 import FocusModel from './model/abstractFocusModel';
@@ -113,7 +114,17 @@ export type RecyclableListFocusOptions = {
     autoLayoutSize?: number;
 };
 
-export interface ViewProps extends RNViewProps {
+type MouseEvents = {
+    onMouseDown?: (e: MouseEvent) => void;
+    onMouseEnter?: (e: MouseEvent) => void;
+    onMouseLeave?: (e: MouseEvent) => void;
+    onMouseMove?: (e: MouseEvent) => void;
+    onMouseOver?: (e: MouseEvent) => void;
+    onMouseOut?: (e: MouseEvent) => void;
+    onMouseUp?: (e: MouseEvent) => void;
+};
+
+export interface ViewProps extends RNViewProps, MouseEvents {
     focusOptions?: {
         group?: string;
         focusKey?: string;
@@ -140,7 +151,7 @@ export interface ViewGroupProps extends RNViewProps {
     ref?: React.ForwardedRef<RNView> | React.MutableRefObject<RNView>;
 }
 
-export interface PressableProps extends RNPressableProps {
+export interface PressableProps extends RNPressableProps, MouseEvents {
     focus?: boolean;
     focusOptions?: PressableFocusOptions;
     focusContext?: FocusContext;
@@ -150,8 +161,8 @@ export interface PressableProps extends RNPressableProps {
     onFocus?: () => void;
     className?: string;
     style?: ViewProps['style'];
-    onHoverIn?: null | ((event: MouseEvent) => void) | undefined;
-    onHoverOut?: null | ((event: MouseEvent) => void) | undefined;
+    onHoverIn?: (e: PointerEvent) => void;
+    onHoverOut?: (e: PointerEvent) => void;
 }
 
 export interface TouchableOpacityProps extends RNTouchableOpacityProps {

packages/create/src/index.ts

@@ -65,3 +65,11 @@ export {
     RemoteHandlerCallback,
     ClassRemoteHandlerCallback,
 } from './remoteHandler';
+
+// Type declarations
+import 'react-native';
+declare module 'react-native' {
+    interface AccessibilityProps {
+        accessibilityLevel?: number;
+    }
+}

packages/create/tools/overrideRNScrollView.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 
@@ -7,16 +7,14 @@ RN_DIR="${CREATE_DIR}/../../../react-native"
 RN_SCROLLVIEW_DIR="${RN_DIR}/Libraries/Components/ScrollView"
 MIN_RN_VERSION="68"
 
-echo "${RN_DIR}/package.json"
-
 if [ -e "${RN_DIR}/package.json" ] ; then 
-  PACKAGE_VERSION=$(cat ${RN_DIR}/package.json \
+  PACKAGE_VERSION=$(cat "${RN_DIR}"/package.json \
     | grep version \
     | head -1 \
     | awk -F: '{print $2 }' \
     | sed 's/[",]//g')
 
-  if [ -e $RN_SCROLLVIEW_DIR ] && [ "${PACKAGE_VERSION:3:2}" -ge "${MIN_RN_VERSION}" ] ; then
+  if [ -e "$RN_SCROLLVIEW_DIR" ] && [ "${PACKAGE_VERSION:3:2}" -ge "${MIN_RN_VERSION}" ] ; then
       sed -i '' "s|'RCTScrollView'|Platform.isTV \&\& Platform.OS === 'android' ? 'RCTScrollViewTV' : 'RCTScrollView'|" "${RN_SCROLLVIEW_DIR}/ScrollViewNativeComponent.js"
       echo "Overriding done."
   else

packages/template-starter/metadata.json

@@ -3,4 +3,4 @@
     "version": "1.1.0-alpha.0",
     "identifier": "io.flexn.template",
     "icon": "./static/icon.png"
-}
+}

packages/template-starter/package.json

@@ -123,4 +123,4 @@
     "browserslist": [
         "> 2%"
     ]
-}
+}

packages/template-starter/renative.json

@@ -269,4 +269,4 @@
             "source": "PROJECT_HOME/secrets/privateConfigs.enc"
         }
     }
-}
+}