android-emulator-webrtc 1.0.16 → 1.0.17

package/dist/components/emulator/views/event_handler.js

@@ -1,44 +1,40 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = withMouseKeyHandler;
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var Proto = _interopRequireWildcard(require("../../../proto/emulator_controller_pb"));
-
 var _emulator_status = _interopRequireDefault(require("../net/emulator_status"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /*
+                                                                                                                                                                                                                                                                                                                                           * Copyright 2019 The Android Open Source Project
+                                                                                                                                                                                                                                                                                                                                           *
+                                                                                                                                                                                                                                                                                                                                           * Licensed under the Apache License, Version 2.0 (the "License");
+                                                                                                                                                                                                                                                                                                                                           * you may not use this file except in compliance with the License.
+                                                                                                                                                                                                                                                                                                                                           * You may obtain a copy of the License at
+                                                                                                                                                                                                                                                                                                                                           *
+                                                                                                                                                                                                                                                                                                                                           *     http://www.apache.org/licenses/LICENSE-2.0
+                                                                                                                                                                                                                                                                                                                                           *
+                                                                                                                                                                                                                                                                                                                                           * Unless required by applicable law or agreed to in writing, software
+                                                                                                                                                                                                                                                                                                                                           * distributed under the License is distributed on an "AS IS" BASIS,
+                                                                                                                                                                                                                                                                                                                                           * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+                                                                                                                                                                                                                                                                                                                                           * See the License for the specific language governing permissions and
+                                                                                                                                                                                                                                                                                                                                           * limitations under the License.
+                                                                                                                                                                                                                                                                                                                                           */
 /**
  * A handler that extends a view to send key/mouse events to the emulator.
  * It wraps the inner component in a div, and will use the jsep handler
@@ -50,16 +46,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
  * You usually want to wrap a EmulatorRtcview, or EmulatorPngView in it.
  */
 function withMouseKeyHandler(WrappedComponent) {
-  var _class, _temp;
-
-  return _temp = _class = /*#__PURE__*/function (_React$Component) {
+  var _class;
+  return _class = /*#__PURE__*/function (_React$Component) {
     (0, _inherits2["default"])(_class, _React$Component);
-
     var _super = _createSuper(_class);
-
     function _class(props) {
       var _this;
-
       (0, _classCallCheck2["default"])(this, _class);
       _this = _super.call(this, props);
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onContextMenu", function (e) {
@@ -68,16 +60,15 @@ function withMouseKeyHandler(WrappedComponent) {
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "scaleCoordinates", function (xp, yp) {
         // It is totally possible that we send clicks that are offscreen..
         var _this$state = _this.state,
-            deviceWidth = _this$state.deviceWidth,
-            deviceHeight = _this$state.deviceHeight;
+          deviceWidth = _this$state.deviceWidth,
+          deviceHeight = _this$state.deviceHeight;
         var _this$handler$current = _this.handler.current,
-            clientHeight = _this$handler$current.clientHeight,
-            clientWidth = _this$handler$current.clientWidth;
+          clientHeight = _this$handler$current.clientHeight,
+          clientWidth = _this$handler$current.clientWidth;
         var scaleX = deviceWidth / clientWidth;
         var scaleY = deviceHeight / clientHeight;
         var x = Math.round(xp * scaleX);
         var y = Math.round(yp * scaleY);
-
         if (isNaN(x) || isNaN(y)) {
           console.log("Ignoring: x: " + x + ", y:" + y);
           return {
@@ -85,7 +76,6 @@ function withMouseKeyHandler(WrappedComponent) {
             y: -1
           };
         }
-
         return {
           x: x,
           y: y,
@@ -96,16 +86,14 @@ function withMouseKeyHandler(WrappedComponent) {
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setMouseCoordinates", function () {
         // Forward the request to the jsep engine.
         var _this$state$mouse = _this.state.mouse,
-            mouseDown = _this$state$mouse.mouseDown,
-            mouseButton = _this$state$mouse.mouseButton,
-            xp = _this$state$mouse.xp,
-            yp = _this$state$mouse.yp;
+          mouseDown = _this$state$mouse.mouseDown,
+          mouseButton = _this$state$mouse.mouseButton,
+          xp = _this$state$mouse.xp,
+          yp = _this$state$mouse.yp;
         var request = new Proto.MouseEvent();
-
         var _this$scaleCoordinate = _this.scaleCoordinates(xp, yp),
-            x = _this$scaleCoordinate.x,
-            y = _this$scaleCoordinate.y;
-
+          x = _this$scaleCoordinate.x,
+          y = _this$scaleCoordinate.y;
         request.setX(x);
         request.setY(y);
         request.setButtons(mouseDown ? mouseButton : 0);
@@ -118,7 +106,6 @@ function withMouseKeyHandler(WrappedComponent) {
           if (e.keyCode === 32) {
             e.preventDefault();
           }
-
           var request = new Proto.KeyboardEvent();
           request.setEventtype(eventType === "KEYDOWN" ? Proto.KeyboardEvent.KeyEventType.KEYDOWN : eventType === "KEYUP" ? Proto.KeyboardEvent.KeyEventType.KEYUP : Proto.KeyboardEvent.KeyEventType.KEYPRESS);
           request.setKey(e.key);
@@ -126,11 +113,11 @@ function withMouseKeyHandler(WrappedComponent) {
           jsep.send("keyboard", request);
         };
       });
+      // Properly handle the mouse events.
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleMouseDown", function (e) {
         var _e$nativeEvent = e.nativeEvent,
-            offsetX = _e$nativeEvent.offsetX,
-            offsetY = _e$nativeEvent.offsetY;
-
+          offsetX = _e$nativeEvent.offsetX,
+          offsetY = _e$nativeEvent.offsetY;
         _this.setState({
           mouse: {
             xp: offsetX,
@@ -144,9 +131,8 @@ function withMouseKeyHandler(WrappedComponent) {
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleMouseUp", function (e) {
         var _e$nativeEvent2 = e.nativeEvent,
-            offsetX = _e$nativeEvent2.offsetX,
-            offsetY = _e$nativeEvent2.offsetY;
-
+          offsetX = _e$nativeEvent2.offsetX,
+          offsetY = _e$nativeEvent2.offsetY;
         _this.setState({
           mouse: {
             xp: offsetX,
@@ -160,67 +146,67 @@ function withMouseKeyHandler(WrappedComponent) {
         // Let's not overload the endpoint with useless events.
         if (!_this.state.mouse.mouseDown) return;
         var _e$nativeEvent3 = e.nativeEvent,
-            offsetX = _e$nativeEvent3.offsetX,
-            offsetY = _e$nativeEvent3.offsetY;
+          offsetX = _e$nativeEvent3.offsetX,
+          offsetY = _e$nativeEvent3.offsetY;
         var mouse = _this.state.mouse;
         mouse.xp = offsetX;
         mouse.yp = offsetY;
-
         _this.setState({
           mouse: mouse
         }, _this.setMouseCoordinates);
       });
+      /**
+       * Scales an axis to linux input codes that the emulator understands.
+       *
+       * @param {*} value The value to transform.
+       * @param {*} minIn The minimum value, the lower bound of the value param.
+       * @param {*} maxIn The maximum value, the upper bound of the value param.
+       */
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "scaleAxis", function (value, minIn, maxIn) {
         var minOut = 0x0; // EV_ABS_MIN
-
         var maxOut = 0x7fff; // EV_ABS_MAX
-
         var rangeOut = maxOut - minOut;
         var rangeIn = maxIn - minIn;
-
         if (rangeIn < 1) {
           return minOut + rangeOut / 2;
         }
-
         return (value - minIn) * rangeOut / rangeIn + minOut | 0;
       });
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setTouchCoordinates", function (type, touches, minForce, maxForce) {
         // We need to calculate the offset of the touch events.
         var rect = _this.handler.current.getBoundingClientRect();
-
         var scaleCoordinates = _this.scaleCoordinates;
         var touchesToSend = Object.keys(touches).map(function (index) {
           var touch = touches[index];
           var clientX = touch.clientX,
-              clientY = touch.clientY,
-              identifier = touch.identifier,
-              force = touch.force,
-              radiusX = touch.radiusX,
-              radiusY = touch.radiusY;
+            clientY = touch.clientY,
+            identifier = touch.identifier,
+            force = touch.force,
+            radiusX = touch.radiusX,
+            radiusY = touch.radiusY;
           var offsetX = clientX - rect.left;
           var offsetY = clientY - rect.top;
-
           var _scaleCoordinates = scaleCoordinates(offsetX, offsetY),
-              x = _scaleCoordinates.x,
-              y = _scaleCoordinates.y,
-              scaleX = _scaleCoordinates.scaleX,
-              scaleY = _scaleCoordinates.scaleY;
-
+            x = _scaleCoordinates.x,
+            y = _scaleCoordinates.y,
+            scaleX = _scaleCoordinates.scaleX,
+            scaleY = _scaleCoordinates.scaleY;
           var scaledRadiusX = 2 * radiusX * scaleX;
           var scaledRadiusY = 2 * radiusY * scaleY;
           var protoTouch = new Proto.Touch();
           protoTouch.setX(x | 0);
           protoTouch.setY(y | 0);
-          protoTouch.setIdentifier(identifier); // Normalize the force
+          protoTouch.setIdentifier(identifier);
 
+          // Normalize the force
           var MT_PRESSURE = _this.scaleAxis(Math.max(minForce, Math.min(maxForce, force)), 0, 1);
-
           protoTouch.setPressure(MT_PRESSURE);
           protoTouch.setTouchMajor(Math.max(scaledRadiusX, scaledRadiusY) | 0);
           protoTouch.setTouchMinor(Math.min(scaledRadiusX, scaledRadiusY) | 0);
           return protoTouch;
-        }); // Make the grpc call.
+        });
 
+        // Make the grpc call.
         var requestTouchEvent = new Proto.TouchEvent();
         requestTouchEvent.setTouchesList(touchesToSend);
         var jsep = _this.props.jsep;
@@ -232,10 +218,9 @@ function withMouseKeyHandler(WrappedComponent) {
           // See https://developer.mozilla.org/en-US/docs/Web/API/Touch_events
           if (e.cancelable) {
             e.preventDefault();
-          } // Some browsers do net have a force sensor, so we have to "fake" values
+          }
+          // Some browsers do net have a force sensor, so we have to "fake" values
           // for start/move/end events.
-
-
           _this.setTouchCoordinates(e.nativeEvent.type, e.nativeEvent.changedTouches, minForce, maxForce);
         };
       });
@@ -257,7 +242,6 @@ function withMouseKeyHandler(WrappedComponent) {
       _this.status = new _emulator_status["default"](emulator);
       return _this;
     }
-
     (0, _createClass2["default"])(_class, [{
       key: "componentDidMount",
       value: function componentDidMount() {
@@ -267,7 +251,6 @@ function withMouseKeyHandler(WrappedComponent) {
       key: "getScreenSize",
       value: function getScreenSize() {
         var _this2 = this;
-
         this.status.updateStatus(function (state) {
           _this2.setState({
             deviceWidth: parseInt(state.hardwareConfig["hw.lcd.width"]) || 1080,
@@ -309,8 +292,7 @@ function withMouseKeyHandler(WrappedComponent) {
   }(_react["default"].Component), (0, _defineProperty2["default"])(_class, "propTypes", {
     /** The emulator object */
     emulator: _propTypes["default"].object.isRequired,
-
     /** Jsep protocol driver, used to send mouse & touch events. */
     jsep: _propTypes["default"].object.isRequired
-  }), _temp;
+  }), _class;
 }

package/dist/components/emulator/views/resizing_component.js

@@ -0,0 +1,86 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = _interopRequireDefault(require("react"));
+var _resizeObserver = _interopRequireDefault(require("@react-hook/resize-observer"));
+/**
+ * @jest-environment jsdom
+ */
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function useSize(target, onResize) {
+  var _React$useState = _react["default"].useState(),
+    _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
+    size = _React$useState2[0],
+    setSize = _React$useState2[1];
+  _react["default"].useLayoutEffect(function () {
+    if (target) {
+      var newSize = target.getBoundingClientRect();
+      console.log("Resizing to ".concat(JSON.stringify(newSize)));
+      setSize(newSize);
+      if (onResize) {
+        onResize(newSize);
+      }
+    }
+  }, [target]);
+
+  // Where the magic happens
+  (0, _resizeObserver["default"])(target, function (entry) {
+    setSize(entry.contentRect);
+    if (onResize) {
+      console.log("Resizing to ".concat(JSON.stringify(entry.contentRect)));
+      onResize(entry.contentRect);
+    }
+  });
+  return size;
+}
+function ResizingComponent(_ref) {
+  var children = _ref.children,
+    onResize = _ref.onResize,
+    dataTestId = _ref["data-testid"];
+  // const ref = useRef();
+  var _React$useState3 = _react["default"].useState(),
+    _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
+    target = _React$useState4[0],
+    setTarget = _React$useState4[1];
+  var size = useSize(target, onResize);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: "100%",
+      height: "100%"
+    },
+    ref: setTarget,
+    "data-testid": dataTestId
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: size === null || size === void 0 ? void 0 : size.width,
+      height: size === null || size === void 0 ? void 0 : size.height
+    }
+  }, children));
+}
+ResizingComponent.propTypes = {
+  onResize: _propTypes["default"].func,
+  "data-testid": _propTypes["default"].string
+};
+var _default = ResizingComponent;
+exports["default"] = _default;