@reactvision/react-viro 2.41.3 → 2.41.5

package/README.md

@@ -1,5 +1,5 @@
 <p align="center" style="background-color: #CCCCCC;">
-  <a href="https://www.nativevision.xyz/">
+  <a href="https://www.reactvision.org/">
     <img src="../viro/public/icons/NVLogo.png">
   </a>
 </p>
@@ -31,9 +31,9 @@ ViroReact is a library for developers to rapidly build augmented reality (AR) an
 
 If you are starting a fresh project with ViroReact, consider cloning one of our starter kits:
 
-- [Expo + TypeScript](https://github.com/NativeVision/expo-starter-kit-typescript)
-- [React Native](https://github.com/NativeVision/starter-kit)
-- [Expo + JavaScript](https://github.com/NativeVision/expo-starter-kit)
+- [Expo + TypeScript](https://github.com/ReactVision/expo-starter-kit-typescript)
+- [React Native](https://github.com/ReactVision/starter-kit)
+- [Expo + JavaScript](https://github.com/ReactVision/expo-starter-kit)
 
 # Examples
 
@@ -47,6 +47,14 @@ See our [Example projects](https://viro-community.readme.io/docs/examples) page.
 
 # A little history...
 
-ViroReact was originaly developed by the [Viro Media](http://www.viromedia.com/) company, but was open sourced in 2019. In late 2020 the Viro Community was formed to help maintain and move the project onwards, updating it so it could run with modern versions of react native, and start to add in new features. NativeVision now focuses on the project full time making sure the codebase is updated and ready for the future of XR / Spatial Computing.
+ViroReact was originaly developed by the [Viro Media](http://www.viromedia.com/) company, but was open sourced in 2019. In late 2020 the Viro Community was formed to help maintain and move the project onwards, updating it so it could run with modern versions of react native, and start to add in new features. ReactVision now focuses on the project full time making sure the codebase is updated and ready for the future of XR / Spatial Computing.
 
-We, as a community, owe a great debt to Viro Media and the people who developed this library originally. We hope to make them proud as it continues to develop and grow in the spirit of open source.
+We, as a community, owe a great debt to Viro Media and the people who developed this library originally. We hope to make them proud as it continues to develop and grow in the Viro Community.
+
+# Supporters
+
+<p align="center">
+  <a href="https://themorrow.digital/">
+    <img src="readmes/morrow-supporter.png" alt="Morrow">
+  </a>
+</p>

package/components/AR/ViroARPlaneSelector.tsx

@@ -11,7 +11,11 @@
 
 "use strict";
 
-import { ViroARPlaneSizes, ViroPlaneUpdatedMap } from "../Types/ViroEvents";
+import {
+  ViroARPlaneSizes,
+  ViroClickStateEvent,
+  ViroPlaneUpdatedMap,
+} from "../Types/ViroEvents";
 import { ViroARPlaneType, ViroNativeRef } from "../Types/ViroUtils";
 import * as React from "react";
 import { ViroMaterials } from "../Material/ViroMaterials";
@@ -65,9 +69,9 @@ export class ViroARPlaneSelector extends React.Component<Props, State> {
 
   _getARPlanes() {
     if (this.state.selectedSurface == -1) {
-      let arPlanes = [];
+      let arPlanes: JSX.Element[] = [];
       let numPlanes = this.props.maxPlanes || _maxPlanes;
-      for (var i = 0; i < numPlanes; i++) {
+      for (let i = 0; i < numPlanes; i++) {
         let foundARPlane = this.state.foundARPlanes[i];
         let surfaceWidth = foundARPlane ? foundARPlane.width : 0;
         let surfaceHeight = foundARPlane ? foundARPlane.height : 0;
@@ -82,7 +86,9 @@ export class ViroARPlaneSelector extends React.Component<Props, State> {
           >
             <ViroQuad
               materials={"ViroARPlaneSelector_Translucent"}
-              onClick={this._getOnClickSurface(i)}
+              onClickState={(clickState, position, source) =>
+                this._getOnClickSurface(i, { clickState, position, source })
+              }
               position={surfacePosition}
               width={surfaceWidth}
               height={surfaceHeight}
@@ -102,17 +108,20 @@ export class ViroARPlaneSelector extends React.Component<Props, State> {
     }
   }
 
-  _getOnClickSurface = (index: number) => {
-    return () => {
-      this.setState({ selectedSurface: index });
-      this._onPlaneSelected(this.state.foundARPlanes[index]);
-    };
+  _getOnClickSurface = (index: number, event: ViroClickStateEvent) => {
+    if (event.clickState < 3) {
+      return;
+    }
+    this.setState({ selectedSurface: index });
+    this._onPlaneSelected(this.state.foundARPlanes[index]);
   };
 
   _onARPlaneUpdated = (index: number) => {
     return (updateMap: ViroPlaneUpdatedMap) => {
-      this.state.foundARPlanes[index] = updateMap;
+      let newPlanes = [...this.state.foundARPlanes];
+      newPlanes[index] = updateMap;
       this.setState({
+        foundARPlanes: newPlanes,
         arPlaneSizes: this.state.arPlaneSizes,
       });
     };

package/components/Utilities/ViroVersion.ts

@@ -1 +1 @@
-export const VIRO_VERSION = "2.41.3";
+export const VIRO_VERSION = "2.41.5";

package/components/ViroText.tsx

@@ -100,7 +100,7 @@ export class ViroText extends ViroBase<Props> {
         // Fixes #272. for some reason, onClick was making it
         // to the native code. Other incorrect props don't make it
         // to the native code.
-        // https://github.com/NativeVision/viro/issues/272
+        // https://github.com/ReactVision/viro/issues/272
         onClick={undefined}
         onTouchViro={this._onTouch}
         onScrollViro={this._onScroll}

package/dist/components/AR/ViroARPlaneSelector.d.ts

@@ -8,7 +8,7 @@
  *
  * @providesModule ViroARPlaneSelector
  */
-import { ViroARPlaneSizes, ViroPlaneUpdatedMap } from "../Types/ViroEvents";
+import { ViroARPlaneSizes, ViroClickStateEvent, ViroPlaneUpdatedMap } from "../Types/ViroEvents";
 import { ViroARPlaneType, ViroNativeRef } from "../Types/ViroUtils";
 import * as React from "react";
 import { ViroCommonProps, ViroObjectProps } from "./ViroCommonProps";
@@ -38,7 +38,7 @@ export declare class ViroARPlaneSelector extends React.Component<Props, State> {
     };
     render(): JSX.Element;
     _getARPlanes(): JSX.Element | JSX.Element[];
-    _getOnClickSurface: (index: number) => () => void;
+    _getOnClickSurface: (index: number, event: ViroClickStateEvent) => void;
     _onARPlaneUpdated: (index: number) => (updateMap: ViroPlaneUpdatedMap) => void;
     _onPlaneSelected: (updateMap: ViroPlaneUpdatedMap) => void;
     reset: () => void;

package/dist/components/AR/ViroARPlaneSelector.js

@@ -62,13 +62,13 @@ class ViroARPlaneSelector extends React.Component {
         if (this.state.selectedSurface == -1) {
             let arPlanes = [];
             let numPlanes = this.props.maxPlanes || _maxPlanes;
-            for (var i = 0; i < numPlanes; i++) {
+            for (let i = 0; i < numPlanes; i++) {
                 let foundARPlane = this.state.foundARPlanes[i];
                 let surfaceWidth = foundARPlane ? foundARPlane.width : 0;
                 let surfaceHeight = foundARPlane ? foundARPlane.height : 0;
                 let surfacePosition = foundARPlane ? foundARPlane.center : [0, 0, 0];
                 arPlanes.push(<ViroARPlane_1.ViroARPlane key={_planePrefix + i} minWidth={this.props.minWidth} minHeight={this.props.minHeight} alignment={this.props.alignment} onAnchorUpdated={this._onARPlaneUpdated(i)}>
-            <ViroQuad_1.ViroQuad materials={"ViroARPlaneSelector_Translucent"} onClick={this._getOnClickSurface(i)} position={surfacePosition} width={surfaceWidth} height={surfaceHeight} rotation={[-90, 0, 0]}/>
+            <ViroQuad_1.ViroQuad materials={"ViroARPlaneSelector_Translucent"} onClickState={(clickState, position, source) => this._getOnClickSurface(i, { clickState, position, source })} position={surfacePosition} width={surfaceWidth} height={surfaceHeight} rotation={[-90, 0, 0]}/>
           </ViroARPlane_1.ViroARPlane>);
             }
             return arPlanes;
@@ -77,16 +77,19 @@ class ViroARPlaneSelector extends React.Component {
             return (<ViroARPlane_1.ViroARPlane key={_planePrefix + this.state.selectedSurface} {...this.props}></ViroARPlane_1.ViroARPlane>);
         }
     }
-    _getOnClickSurface = (index) => {
-        return () => {
-            this.setState({ selectedSurface: index });
-            this._onPlaneSelected(this.state.foundARPlanes[index]);
-        };
+    _getOnClickSurface = (index, event) => {
+        if (event.clickState < 3) {
+            return;
+        }
+        this.setState({ selectedSurface: index });
+        this._onPlaneSelected(this.state.foundARPlanes[index]);
     };
     _onARPlaneUpdated = (index) => {
         return (updateMap) => {
-            this.state.foundARPlanes[index] = updateMap;
+            let newPlanes = [...this.state.foundARPlanes];
+            newPlanes[index] = updateMap;
             this.setState({
+                foundARPlanes: newPlanes,
                 arPlaneSizes: this.state.arPlaneSizes,
             });
         };

package/dist/components/Utilities/ViroVersion.d.ts

@@ -1 +1 @@
-export declare const VIRO_VERSION = "2.41.3";
+export declare const VIRO_VERSION = "2.41.5";

package/dist/components/Utilities/ViroVersion.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VIRO_VERSION = void 0;
-exports.VIRO_VERSION = "2.41.3";
+exports.VIRO_VERSION = "2.41.5";

package/dist/components/ViroText.js

@@ -77,7 +77,7 @@ class ViroText extends ViroBase_1.ViroBase {
         // Fixes #272. for some reason, onClick was making it
         // to the native code. Other incorrect props don't make it
         // to the native code.
-        // https://github.com/NativeVision/viro/issues/272
+        // https://github.com/ReactVision/viro/issues/272
         onClick={undefined} onTouchViro={this._onTouch} onScrollViro={this._onScroll} onSwipeViro={this._onSwipe} onDragViro={this._onDrag} onPinchViro={this._onPinch} onRotateViro={this._onRotate} onFuseViro={this._onFuse} onAnimationStartViro={this._onAnimationStart} onAnimationFinishViro={this._onAnimationFinish} materials={materials} transformBehaviors={transformBehaviors} outerStroke={outerStroke} canCollide={this.props.onCollision != undefined} onCollisionViro={this._onCollision} timeToFuse={timeToFuse}/>);
     }
 }

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "version": "2.41.3",
+  "version": "2.41.5",
   "license": "MIT",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/android/gvr_common/build/.transforms/1f305c8102b4f1e133a87e936f1e9964/results.bin

@@ -1 +0,0 @@
-o/com.google.vr.cardboard

package/android/gvr_common/build/.transforms/671af4785a8109ab1e811c3e952ce8a0/results.bin

@@ -1 +0,0 @@
-o/jetified-sdk-common-1.180.0-api.jar

package/android/gvr_common/build/.transforms/7ef00283b562187d9050275ffa4b0660/results.bin

@@ -1 +0,0 @@
-i/res

package/android/gvr_common/build/.transforms/f19cf8825806cdc4e4891f0b3948f623/results.bin

@@ -1 +0,0 @@
-o/jetified-sdk-common-1.180.0.aar

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/results.bin

@@ -1 +0,0 @@
-o/jetified-sdk-common-1.180.0

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/AndroidManifest.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.vr.cardboard" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="19" />
-
-</manifest>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/R.txt

@@ -1,55 +0,0 @@
-int color alignment_marker_color 0x1
-int color white_transparent 0x1
-int dimen alignment_marker_height 0x1
-int dimen alignment_marker_thickness 0x1
-int dimen transition_bottom_bar_height 0x1
-int drawable quantum_ic_close_white_24 0x1
-int drawable quantum_ic_settings_white_24 0x1
-int drawable rippleable 0x1
-int drawable transition 0x1
-int id back_button 0x1
-int id divider 0x1
-int id transition_bottom_frame 0x1
-int id transition_frame 0x1
-int id transition_icon 0x1
-int id transition_question_text 0x1
-int id transition_switch_action 0x1
-int id transition_text 0x1
-int id transition_top_frame 0x1
-int id ui_alignment_marker 0x1
-int id ui_back_button 0x1
-int id ui_back_button_holder 0x1
-int id ui_settings_button 0x1
-int id ui_settings_button_holder 0x1
-int layout back_button 0x1
-int layout settings_button 0x1
-int layout transition_view 0x1
-int layout ui_layer 0x1
-int layout ui_layer_with_portrait_support 0x1
-int string back_button_content_description 0x1
-int string cancel_button 0x1
-int string dialog_button_got_it 0x1
-int string dialog_button_open_help_center 0x1
-int string dialog_message_incompatible_phone 0x1
-int string dialog_message_no_cardboard 0x1
-int string dialog_title 0x1
-int string dialog_title_incompatible_phone 0x1
-int string dialog_title_vr_core_not_enabled 0x1
-int string dialog_title_vr_core_not_installed 0x1
-int string dialog_title_warning 0x1
-int string dialog_vr_core_not_enabled 0x1
-int string dialog_vr_core_not_installed 0x1
-int string go_to_playstore_button 0x1
-int string go_to_vr_listeners_settings_button 0x1
-int string gvr_vr_mode_component 0x1
-int string no_browser_text 0x1
-int string place_your_phone_into_cardboard 0x1
-int string place_your_viewer_into_viewer_format 0x1
-int string settings_button_content_description 0x1
-int string setup_button 0x1
-int string switch_viewer_action 0x1
-int string switch_viewer_prompt 0x1
-int style GvrDialogTheme 0x1
-int style NoSystemUI 0x1
-int style UiButton 0x1
-int style VrActivityTheme 0x1

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/proguard.txt

@@ -1,19 +0,0 @@
-# Proguard rules for commonly-shared libraries in gvr.
-
-# Note: this comes from //jcg/android/apps/common/proguard/annotations.flags
-# but cannot be used directly because it would require including a google3
-# Java dependency in VR Toolkit, which would break the gradle build.
--keepattributes *Annotation*
-# Keep natively accessed methods used by Cardboard.
-# TODO(b/28564144): remove when the old UsedByNative annotation is removed.
--keep class com.google.vr.cardboard.UsedByNative
--keep @com.google.vr.cardboard.UsedByNative class *
--keepclassmembers class * {
-    @com.google.vr.cardboard.UsedByNative *;
-}
-
-# These are part of the Java <-> native interfaces for GVR.
--keepclasseswithmembernames,includedescriptorclasses class com.google.vr.** {
-    native <methods>;
-}
-

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/drawable/rippleable.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Background that displays a white transparent color when touched.
-  This does no actual rippling pre-21, but is overridden on 21 to use a RippleDrawable.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item
-        android:drawable="@color/white_transparent"
-        android:state_pressed="true"/>
-    <item android:drawable="@android:color/transparent"/>
-</selector>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/drawable-v21/rippleable.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Background that ripples with a white transparent color when touched.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/white_transparent">
-</ripple>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/back_button.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Back button for portrait orientation with left-to-right locale -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/UiButton"
-  android:src="@drawable/quantum_ic_close_white_24"
-  android:layout_alignParentRight="true"
-  android:layout_alignParentTop="true"/>
-

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/settings_button.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Settings button for portrait orientation with left-to-right locale -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/UiButton"
-  android:src="@drawable/quantum_ic_settings_white_24"
-  android:contentDescription="@string/settings_button_content_description"
-  android:layout_alignParentRight="true"
-  android:layout_alignParentBottom="true"/>
-

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/transition_view.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/transition_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/back_button"
-        style="@style/UiButton"
-        android:src="@drawable/quantum_ic_close_white_24"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"/>
-
-    <RelativeLayout
-        android:id="@+id/transition_top_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:paddingBottom="48dp">
-
-        <ImageView
-            android:id="@+id/transition_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="4dp"
-            android:layout_centerHorizontal="true"
-            android:scaleType="center"
-            android:src="@drawable/transition" />
-        <TextView
-            android:id="@+id/transition_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:gravity="center"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
-            android:layout_below="@id/transition_icon"
-            android:text="@string/place_your_phone_into_cardboard" />
-    </RelativeLayout>
-
-    <!-- Note that the transition_bottom_frame element may be programmatically
-         hidden when the device or view layout is landscape. -->
-    <LinearLayout
-        android:id="@+id/transition_bottom_frame"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/transition_bottom_bar_height"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:background="#FF546E7A">
-        <TextView
-            android:id="@+id/transition_question_text"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_below="@id/transition_icon"
-            android:layout_marginStart="24dp"
-            android:paddingEnd="20dp"
-            android:gravity="start|center_vertical"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
-            android:text="@string/switch_viewer_prompt"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-        <View
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:id="@+id/divider"
-            android:background="#1F000000"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
-        <TextView
-            android:id="@+id/transition_switch_action"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingStart="20dp"
-            android:paddingEnd="24dp"
-            android:gravity="end|center_vertical"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
-            android:text="@string/switch_viewer_action"
-            android:textAllCaps="true"
-            android:background="?android:attr/selectableItemBackground"/>
-    </LinearLayout>
-
-</RelativeLayout>

package/android/gvr_common/build/.transforms/f243c80b103fba9462a0988ec6b80d5d/transformed/jetified-sdk-common-1.180.0/res/layout/ui_layer.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-    <!-- Default UiLayer layout that assumes landscape orientation !-->
-    <!-- LINT.IfChange -->
-    <!-- The ui and settings button holders are 84dp. This is twice the size -->
-    <!-- of the button itself after padding (24dp image, 9dp padding twice). -->
-    <FrameLayout
-      android:id="@+id/ui_back_button_holder"
-      android:layout_alignParentStart="true"
-      android:layout_alignParentTop="true"
-      android:layout_width="84dp"
-      android:layout_height="84dp">
-      <ImageButton
-        style="@style/UiButton"
-        android:id="@+id/ui_back_button"
-        android:contentDescription="@string/back_button_content_description"
-        android:src="@drawable/quantum_ic_close_white_24"
-        android:layout_gravity="start|top"/>
-    </FrameLayout>
-
-    <RelativeLayout
-      android:id="@+id/ui_alignment_marker"
-      android:layout_width="@dimen/alignment_marker_thickness"
-      android:layout_height="@dimen/alignment_marker_height"
-      android:layout_centerHorizontal="true"
-      android:layout_alignParentBottom="true"
-      android:background="@color/alignment_marker_color">
-    </RelativeLayout>
-
-    <FrameLayout
-      android:id="@+id/ui_settings_button_holder"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentTop="true"
-      android:layout_width="84dp"
-      android:layout_height="84dp">
-      <ImageButton
-        style="@style/UiButton"
-        android:id="@+id/ui_settings_button"
-        android:contentDescription="@string/settings_button_content_description"
-        android:src="@drawable/quantum_ic_settings_white_24"
-        android:layout_gravity="end|top"/>
-    </FrameLayout>
-
-    <!-- LINT.ThenChange(//depot/google3/java/com/google/vr/vrcore/compositor/res/layout/ui_layer_compositor.xml) -->
-
-</RelativeLayout>