@hedia/recommendation-screen 2.1.22 → 2.1.23-alpha.1

package/jest.config.js

@@ -179,9 +179,9 @@ module.exports = {
 	// transform: undefined,
 
 	// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-	// transformIgnorePatterns: [
-	//   "/node_modules/"
-	// ],
+	transformIgnorePatterns: [
+		"node_modules/(?!(@react-native|react-native|react-native-vector-icons|react-native-linear-gradient|react-native-modal|react-native-animatable)/)"
+	],
 
 	// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
 	// unmockedModulePathPatterns: undefined,

package/jest.mock.js

@@ -1 +1 @@
-jest.mock('react-native/Libraries/Animated/src/NativeAnimatedHelper');
+jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper')

package/metro.config.js

@@ -10,7 +10,7 @@ module.exports = {
     getTransformOptions: async () => ({
       transform: {
         experimentalImportSupport: false,
-        inlineRequires: false,
+        inlineRequires: true,
       },
     }),
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedia/recommendation-screen",
-  "version": "2.1.22",
+  "version": "2.1.23-alpha.1",
   "description": "Hedia Recommendation Screen for Bolus and Carbohydrates",
   "main": "index.js",
   "scripts": {
@@ -32,36 +32,37 @@
   "author": "Hedia",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "7.10.3",
+    "@babel/core": "7.12.9",
     "@babel/plugin-proposal-decorators": "7.8.3",
     "@babel/plugin-transform-typescript": "7.13.0",
     "@babel/preset-env": "7.10.2",
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.10.1",
+    "@babel/runtime": "7.12.5",
     "@hedia/recommendation-calculator": "2.0.7",
     "@react-native-community/slider": "3.0.0",
     "@testing-library/jest-native": "3.1.0",
-    "@types/jest": "25.2.3",
+    "@types/jest": "26.0.24",
     "@types/lingui__core": "2.7.0",
     "@types/lingui__macro": "2.7.3",
     "@types/lingui__react": "2.8.2",
     "@types/react": "16.9.35",
-    "@types/react-native": "0.62.13",
+    "@types/react-native": "0.65.3",
     "@types/react-test-renderer": "17.0.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "26.0.1",
     "babel-loader": "8.1.0",
     "babel-plugin-macros": "2.8.0",
-    "jest": "26.0.1",
-    "metro-react-native-babel-preset": "0.58.0",
+    "jest": "26.6.3",
+    "metro-react-native-babel-preset": "0.66.2",
     "npm-package-json-lint": "5.1.0",
     "prettier": "2.2.1",
-    "react": "16.13.1",
-    "react-native": "0.62.2",
+    "react": "17.0.2",
+    "react-native": "0.66.0",
     "react-native-linear-gradient": "2.5.6",
     "react-native-testing-library": "2.1.0",
     "react-native-vector-icons": "6.6.0",
-    "react-test-renderer": "16.13.1",
+    "react-test-renderer": "17.0.2",
     "tslint": "6.1.2",
     "tslint-config-prettier": "1.18.0",
     "typedoc": "0.21.4",

package/src/RecommendationScreen.d.ts

@@ -142,6 +142,11 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
      * The member is initiated without a value but will be set as soon as the component is being rendered.
      */
     private scrollView?;
+    /**
+     * A reference to the eventSubscription that'll be returned by addEventListener().
+     * It'll allow us to later remove the subscription.
+     */
+    private appStateSubscription?;
     /**
      * Steps:
      * 1. Call the super() method with the props.
@@ -178,7 +183,7 @@ export default class RecommendationScreen extends React.Component<IRecommendatio
      * Called immediately before a component is destroyed.
      * Perform any necessary cleanup in this method, such as cancelled network requests, or cleaning up any DOM elements created in componentDidMount.
      *
-     * Clear the 15 minute timer that was set in the constructor during initialisation so it doesn’t keep running and gets triggered after the recommendation screen was closed.
+     * Clear the 15 minute timer that was set in the constructor during initialisation so it doesn't keep running and gets triggered after the recommendation screen was closed.
      *
      * Steps:
      * 1. Call clearTimeout on the timer member variable.

package/src/RecommendationScreen.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { AppState, ScrollView, StyleSheet, View, YellowBox } from "react-native";
+import { AppState, LogBox, ScrollView, StyleSheet, View } from "react-native";
 import { BACKGROUND_COLOUR_PURPLE, BORDER_COLOUR_GREY, BORDER_COLOUR_TEAL } from "./utils/Constants";
 import Header from "./components/Header";
 import InfoBars, { infoStyles } from "./components/InfoBars";
@@ -26,7 +26,7 @@ import { validateParams } from "./utils/Validations";
 const { InfoBarTestIds, RecommendationScreenTestIds } = Testing.Id;
 // Ignoring long timer warnings
 // https://github.com/facebook/react-native/issues/12981#issuecomment-652745831
-YellowBox.ignoreWarnings([`Setting a timer`]);
+LogBox.ignoreLogs([`Setting a timer`]);
 /**
  * The RecommendationScreen is the React component that passes relevant inputs to the recommendation calculation module and presents
  * the resulting recommendation along with related messages or warnings to the user.
@@ -389,13 +389,13 @@ export default class RecommendationScreen extends React.Component {
      * 1. Create a listener to call the handleAppStateChange() method when the app state changes.
      */
     componentDidMount() {
-        AppState.addEventListener(`change`, this.handleAppStateChange);
+        this.appStateSubscription = AppState.addEventListener(`change`, this.handleAppStateChange);
     }
     /**
      * Called immediately before a component is destroyed.
      * Perform any necessary cleanup in this method, such as cancelled network requests, or cleaning up any DOM elements created in componentDidMount.
      *
-     * Clear the 15 minute timer that was set in the constructor during initialisation so it doesn’t keep running and gets triggered after the recommendation screen was closed.
+     * Clear the 15 minute timer that was set in the constructor during initialisation so it doesn't keep running and gets triggered after the recommendation screen was closed.
      *
      * Steps:
      * 1. Call clearTimeout on the timer member variable.
@@ -405,7 +405,7 @@ export default class RecommendationScreen extends React.Component {
         if (this.timer !== undefined) {
             clearTimeout(this.timer);
         }
-        AppState.removeEventListener(`change`, this.handleAppStateChange);
+        this.appStateSubscription?.remove();
     }
     /** Render a JSX element for displaying the insulin recommendation screen. */
     render() {

package/src/__tests__/RecommendationScreen.test.js

@@ -892,15 +892,14 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
     test(`Opening the app with a old calculation will show the timeout modal`, () => {
         const props = getRecommendationProps();
         let appStateListener;
-        const getMockAppStateListener = jest.fn((event, callback) => {
+        const getMockAppStateListener = jest.fn((event, listener) => {
             if (event === `change`) {
-                appStateListener = callback;
+                appStateListener = listener;
             }
         });
         jest.resetModules();
         jest.doMock(`react-native/Libraries/AppState/AppState`, () => ({
             addEventListener: getMockAppStateListener,
-            removeEventListener: jest.fn(),
         }));
         const wrapper = render(<RecommendationScreen {...props}/>);
         // @ts-ignore
@@ -914,7 +913,7 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         expectTextNotExists(wrapper, `No, return to dashboard`);
         global.Date.now = () => new Date().getTime() + Milliseconds.Minute * 15;
         // @ts-ignore
-        appStateListener(`active`);
+        appStateListener?.(`active`);
         wrapper.rerender(<RecommendationScreen {...props}/>);
         expect(props.showBolusBar).toBeCalledWith(false);
         expectTextExists(wrapper, `No, return to dashboard`);
@@ -935,11 +934,10 @@ describe(`Recommendation Screen - TwoOptionModal related tests`, () => {
         jest.resetModules();
         jest.doMock(`react-native/Libraries/AppState/AppState`, () => ({
             addEventListener: getMockAppStateListener,
-            removeEventListener: jest.fn(),
         }));
         const rendered = render(<RecommendationScreen {...props}/>);
         // @ts-ignore
-        appStateListener(`NotAnAppStateStatus`);
+        appStateListener?.(`NotAnAppStateStatus`);
         rendered.rerender(<RecommendationScreen {...props}/>);
         expect(props.showBolusBar).not.toBeCalled();
         expectTextNotExists(rendered, `No, return to dashboard`);

package/ios/HediaRecommendationScreen/Base.lproj/LaunchScreen.xib

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Powered by React Native" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HediaRecommendationScreen" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
-            </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
-        </view>
-    </objects>
-</document>

package/ios/HediaRecommendationScreen-tvOS/Info.plist

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
-</plist>

package/ios/HediaRecommendationScreen-tvOSTests/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>