@react-native-oh-tpl/react-native-gesture-handler 2.12.1-0.0.1 → 2.12.6-2

package/harmony/gesture_handler/src/main/ets/View.ts

@@ -0,0 +1,71 @@
+import { DescriptorRegistry, Descriptor, Tag } from "rnoh/ts"
+import { Vector2D } from "./Vector2D"
+
+export type BoundingBox = {
+  x: number,
+  y: number,
+  width: number,
+  height: number
+}
+
+export class View {
+  constructor(private descriptorRegistry: DescriptorRegistry, private viewTag: number) {
+  }
+
+  public getChildren() {
+    return this.getDescriptor().childrenTags.map(childrenTag => {
+      return new View(this.descriptorRegistry, childrenTag)
+    })
+  }
+
+  public getTag(): Tag {
+    return this.viewTag
+  }
+
+  public isPositionInBounds({x, y}: {
+    x: number,
+    y: number
+  }): boolean {
+    const rect = this.getBoundingRect()
+    return x >= rect.x && x <= (rect.x + rect.width) && y >= rect.y && y <= (rect.y + rect.height);
+  }
+
+  public getBoundingRect(): BoundingBox {
+    const d = this.getDescriptor()
+    if (!d) {
+      return { x: 0, y: 0, width: 0, height: 0 }
+    }
+    const offsetToAbsolutePosition = this.getOffsetToAbsolutePosition()
+    return {
+      x: d.layoutMetrics.frame.origin.x - offsetToAbsolutePosition.x,
+      y: d.layoutMetrics.frame.origin.y - offsetToAbsolutePosition.y,
+      width: d.layoutMetrics.frame.size.width,
+      height: d.layoutMetrics.frame.size.height
+    }
+  }
+
+  private getDescriptor() {
+    return this.descriptorRegistry.getDescriptor(this.viewTag)
+  }
+
+
+  private getOffsetToAbsolutePosition(): Vector2D {
+    const currentOffset = new Vector2D()
+    let parentTag = this.getDescriptor()?.parentTag
+    while (parentTag !== undefined) {
+      const d = this.descriptorRegistry.getDescriptor(parentTag)
+      currentOffset.add(this.extractScrollOffsetFromDescriptor(d))
+      currentOffset.subtract(new Vector2D(d.layoutMetrics.frame.origin))
+      parentTag = d.parentTag
+    }
+    return currentOffset
+  }
+
+  private extractScrollOffsetFromDescriptor(descriptor: Descriptor<any>) {
+    if (descriptor.type !== "ScrollView") {
+      return new Vector2D();
+    }
+    const scrollViewState: any = descriptor.state;
+    return new Vector2D({ x: scrollViewState.contentOffsetX, y: scrollViewState.contentOffsetY })
+  }
+}

package/harmony/gesture_handler/src/main/ets/ViewRegistry.ts

@@ -0,0 +1,43 @@
+import { DescriptorRegistry, ComponentManagerRegistry, Tag } from "rnoh/ts"
+import { View } from "./View"
+
+export class ViewRegistry {
+  constructor(private descriptorRegistry: DescriptorRegistry, private componentManagerRegistry: ComponentManagerRegistry) {
+  }
+
+  public getViewByTag(viewTag: Tag) {
+    return this.createView(viewTag)
+  }
+
+  private createView(tag: Tag): View {
+    return new View(this.descriptorRegistry, tag)
+  }
+
+  public getTouchableViewsAt(pos: {
+    x: number,
+    y: number
+  }, rootTag: Tag): View[] {
+    const rootView = this.createView(rootTag)
+    const results: View[] = []
+    for (const view of this.getTouchableViewsAtPosInView(pos, rootView)) {
+      results.push(view)
+    }
+    return results
+  }
+
+  private getTouchableViewsAtPosInView(pos: {
+    x: number,
+    y: number
+  }, view: View) {
+    if (!view.isPositionInBounds(pos))
+      return [];
+    const results: View[] = []
+    results.push(view)
+    for (const child of view.getChildren()) {
+      for (const result of this.getTouchableViewsAtPosInView(pos, child)) {
+        results.push(result)
+      }
+    }
+    return results
+  }
+}

package/harmony/gesture_handler/src/main/ets/pages/Index.ets

@@ -0,0 +1,17 @@
+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World'
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}

package/harmony/gesture_handler/src/main/ets/webviewability/WebviewAbility.ts

@@ -0,0 +1,41 @@
+import UIAbility from '@ohos.app.ability.UIAbility';
+import hilog from '@ohos.hilog';
+import window from '@ohos.window';
+
+export default class WebviewAbility extends UIAbility {
+  onCreate(want, launchParam) {
+    hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
+  }
+
+  onDestroy() {
+    hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy');
+  }
+
+  onWindowStageCreate(windowStage: window.WindowStage) {
+    // Main window is created, set main page for this ability
+    hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
+
+    windowStage.loadContent('pages/Index', (err, data) => {
+      if (err.code) {
+        hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
+        return;
+      }
+      hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
+    });
+  }
+
+  onWindowStageDestroy() {
+    // Main window is destroyed, release UI related resources
+    hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy');
+  }
+
+  onForeground() {
+    // Ability has brought to foreground
+    hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
+  }
+
+  onBackground() {
+    // Ability has back to background
+    hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground');
+  }
+}

package/harmony/gesture_handler/src/main/module.json5

@@ -0,0 +1,7 @@
+{
+  "module": {
+    "name": "gesture_handler",
+    "type": "har",
+    "deviceTypes": ['default'],
+  }
+}

package/harmony/gesture_handler/src/main/resources/base/element/color.json

@@ -0,0 +1,8 @@
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
+}

package/harmony/gesture_handler/src/main/resources/base/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "WebviewAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "WebviewAbility_label",
+      "value": "label"
+    }
+  ]
+}

package/harmony/gesture_handler/src/main/resources/base/profile/main_pages.json

@@ -0,0 +1,5 @@
+{
+  "src": [
+    "pages/Index"
+  ]
+}

package/harmony/gesture_handler/src/main/resources/en_US/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "WebviewAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "WebviewAbility_label",
+      "value": "label"
+    }
+  ]
+}

package/harmony/gesture_handler/src/main/resources/zh_CN/element/string.json

@@ -0,0 +1,16 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "模块描述"
+    },
+    {
+      "name": "WebviewAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "WebviewAbility_label",
+      "value": "label"
+    }
+  ]
+}

package/harmony/gesture_handler/ts.ts

@@ -0,0 +1 @@
+export * from "./src/main/ets/GestureHandlerPackage"

package/lib/commonjs/RNGestureHandlerModule.js

@@ -3,27 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
+exports.RNGestureHandlerModule = void 0;
 var _reactNative = require("react-native");
-
-var _utils = require("./utils");
-
-const {
-  RNGestureHandlerModule
-} = _reactNative.NativeModules;
-
-if (RNGestureHandlerModule == null) {
-  console.error((0, _utils.tagMessage)(`react-native-gesture-handler module was not found. Make sure you're running your app on the native platform and your code is linked properly (cd ios && pod install && cd ..).
-
-      For installation instructions, please refer to https://docs.swmansion.com/react-native-gesture-handler/docs/#installation`.split('\n').map(line => line.trim()).join('\n')));
-}
-
-if (RNGestureHandlerModule && RNGestureHandlerModule.flushOperations === undefined) {
-  RNGestureHandlerModule.flushOperations = () => {// NO-OP if not defined
-  };
-}
-
-var _default = RNGestureHandlerModule;
-exports.default = _default;
+const RNGestureHandlerModule = exports.RNGestureHandlerModule = _reactNative.TurboModuleRegistry.get('RNGestureHandlerModule');
 //# sourceMappingURL=RNGestureHandlerModule.js.map

package/lib/commonjs/RNGestureHandlerModule.js.map

@@ -1 +1 @@
-{"version":3,"sources":["RNGestureHandlerModule.ts"],"names":["RNGestureHandlerModule","NativeModules","console","error","split","map","line","trim","join","flushOperations","undefined"],"mappings":";;;;;;;AAAA;;AAEA;;AACA,MAAM;AAAEA,EAAAA;AAAF,IAA6BC,0BAAnC;;AAEA,IAAID,sBAAsB,IAAI,IAA9B,EAAoC;AAClCE,EAAAA,OAAO,CAACC,KAAR,CACE,uBACG;AACP;AACA,gIAFM,CAGGC,KAHH,CAGS,IAHT,EAIGC,GAJH,CAIQC,IAAD,IAAUA,IAAI,CAACC,IAAL,EAJjB,EAKGC,IALH,CAKQ,IALR,CADF,CADF;AAUD;;AAED,IACER,sBAAsB,IACtBA,sBAAsB,CAACS,eAAvB,KAA2CC,SAF7C,EAGE;AACAV,EAAAA,sBAAsB,CAACS,eAAvB,GAAyC,MAAM,CAC7C;AACD,GAFD;AAGD;;eAwBcT,sB","sourcesContent":["import { NativeModules } from 'react-native';\r\nimport { ActionType } from './ActionType';\r\nimport { tagMessage } from './utils';\r\nconst { RNGestureHandlerModule } = NativeModules;\r\n\r\nif (RNGestureHandlerModule == null) {\r\n  console.error(\r\n    tagMessage(\r\n      `react-native-gesture-handler module was not found. Make sure you're running your app on the native platform and your code is linked properly (cd ios && pod install && cd ..).\r\n\r\n      For installation instructions, please refer to https://docs.swmansion.com/react-native-gesture-handler/docs/#installation`\r\n        .split('\\n')\r\n        .map((line) => line.trim())\r\n        .join('\\n')\r\n    )\r\n  );\r\n}\r\n\r\nif (\r\n  RNGestureHandlerModule &&\r\n  RNGestureHandlerModule.flushOperations === undefined\r\n) {\r\n  RNGestureHandlerModule.flushOperations = () => {\r\n    // NO-OP if not defined\r\n  };\r\n}\r\n\r\nexport type RNGestureHandlerModuleProps = {\r\n  handleSetJSResponder: (tag: number, blockNativeResponder: boolean) => void;\r\n  handleClearJSResponder: () => void;\r\n  createGestureHandler: (\r\n    handlerName: string,\r\n    handlerTag: number,\r\n    config: Readonly<Record<string, unknown>>\r\n  ) => void;\r\n  attachGestureHandler: (\r\n    handlerTag: number,\r\n    newView: number,\r\n    actionType: ActionType\r\n  ) => void;\r\n  updateGestureHandler: (\r\n    handlerTag: number,\r\n    newConfig: Readonly<Record<string, unknown>>\r\n  ) => void;\r\n  dropGestureHandler: (handlerTag: number) => void;\r\n  install: () => void;\r\n  flushOperations: () => void;\r\n};\r\n\r\nexport default RNGestureHandlerModule as RNGestureHandlerModuleProps;\r\n"]}
+{"version":3,"names":["_reactNative","require","RNGestureHandlerModule","exports","TurboModuleRegistry","get"],"sourceRoot":"..\\..\\src","sources":["RNGestureHandlerModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAKO,MAAMC,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAGE,gCAAmB,CAACC,GAAG,CAAO,wBAAwB,CAAE"}

package/lib/commonjs/components/GestureButtons.js

@@ -3,113 +3,91 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BorderlessButton = exports.BaseButton = void 0;
 Object.defineProperty(exports, "PureNativeButton", {
   enumerable: true,
   get: function () {
     return _GestureHandlerButton.default;
   }
 });
-exports.BorderlessButton = exports.RectButton = exports.BaseButton = exports.RawButton = void 0;
-
+exports.RectButton = exports.RawButton = void 0;
 var React = _interopRequireWildcard(require("react"));
-
 var _reactNative = require("react-native");
-
 var _createNativeWrapper = _interopRequireDefault(require("../handlers/createNativeWrapper"));
-
 var _GestureHandlerButton = _interopRequireDefault(require("./GestureHandlerButton"));
-
-var _State = require("../State");
-
+var _State = require("react-native-gesture-handler/src/State");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-const RawButton = (0, _createNativeWrapper.default)(_GestureHandlerButton.default, {
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+const RawButton = exports.RawButton = (0, _createNativeWrapper.default)(_GestureHandlerButton.default, {
   shouldCancelWhenOutside: false,
   shouldActivateOnStart: false
 });
-exports.RawButton = RawButton;
-
 class BaseButton extends React.Component {
+  static defaultProps = {
+    delayLongPress: 600
+  };
   constructor(props) {
     super(props);
-
-    _defineProperty(this, "lastActive", void 0);
-
-    _defineProperty(this, "longPressTimeout", void 0);
-
-    _defineProperty(this, "longPressDetected", void 0);
-
-    _defineProperty(this, "handleEvent", ({
-      nativeEvent
-    }) => {
-      const {
-        state,
-        oldState,
-        pointerInside
-      } = nativeEvent;
-      const active = pointerInside && state === _State.State.ACTIVE;
-
-      if (active !== this.lastActive && this.props.onActiveStateChange) {
-        this.props.onActiveStateChange(active);
-      }
-
-      if (!this.longPressDetected && oldState === _State.State.ACTIVE && state !== _State.State.CANCELLED && this.lastActive && this.props.onPress) {
-        this.props.onPress(active);
-      }
-
-      if (!this.lastActive && // NativeViewGestureHandler sends different events based on platform
-      state === (_reactNative.Platform.OS !== 'android' ? _State.State.ACTIVE : _State.State.BEGAN) && pointerInside) {
-        this.longPressDetected = false;
-
-        if (this.props.onLongPress) {
-          this.longPressTimeout = setTimeout(this.onLongPress, this.props.delayLongPress);
-        }
-      } else if ( // cancel longpress timeout if it's set and the finger moved out of the view
-      state === _State.State.ACTIVE && !pointerInside && this.longPressTimeout !== undefined) {
-        clearTimeout(this.longPressTimeout);
-        this.longPressTimeout = undefined;
-      } else if ( // cancel longpress timeout if it's set and the gesture has finished
-      this.longPressTimeout !== undefined && (state === _State.State.END || state === _State.State.CANCELLED || state === _State.State.FAILED)) {
-        clearTimeout(this.longPressTimeout);
-        this.longPressTimeout = undefined;
-      }
-
-      this.lastActive = active;
-    });
-
-    _defineProperty(this, "onLongPress", () => {
-      var _this$props$onLongPre, _this$props;
-
-      this.longPressDetected = true;
-      (_this$props$onLongPre = (_this$props = this.props).onLongPress) === null || _this$props$onLongPre === void 0 ? void 0 : _this$props$onLongPre.call(_this$props);
-    });
-
-    _defineProperty(this, "onHandlerStateChange", e => {
-      var _this$props$onHandler, _this$props2;
-
-      (_this$props$onHandler = (_this$props2 = this.props).onHandlerStateChange) === null || _this$props$onHandler === void 0 ? void 0 : _this$props$onHandler.call(_this$props2, e);
-      this.handleEvent(e);
-    });
-
-    _defineProperty(this, "onGestureEvent", e => {
-      var _this$props$onGesture, _this$props3;
-
-      (_this$props$onGesture = (_this$props3 = this.props).onGestureEvent) === null || _this$props$onGesture === void 0 ? void 0 : _this$props$onGesture.call(_this$props3, e);
-      this.handleEvent(e); // TODO: maybe it is not correct
-    });
-
     this.lastActive = false;
     this.longPressDetected = false;
   }
-
+  handleEvent = ({
+    nativeEvent
+  }) => {
+    const {
+      state,
+      oldState,
+      pointerInside
+    } = nativeEvent;
+    const active = pointerInside && state === _State.State.ACTIVE;
+    if (active !== this.lastActive && this.props.onActiveStateChange) {
+      this.props.onActiveStateChange(active);
+    }
+    if (!this.longPressDetected && oldState === _State.State.ACTIVE && state !== _State.State.CANCELLED && this.lastActive && this.props.onPress) {
+      this.props.onPress(active);
+    }
+    if (!this.lastActive &&
+    // NativeViewGestureHandler sends different events based on platform
+    state === (_reactNative.Platform.OS !== 'android' ? _State.State.ACTIVE : _State.State.BEGAN) && pointerInside) {
+      this.longPressDetected = false;
+      if (this.props.onLongPress) {
+        this.longPressTimeout = setTimeout(this.onLongPress, this.props.delayLongPress);
+      }
+    } else if (
+    // cancel longpress timeout if it's set and the finger moved out of the view
+    state === _State.State.ACTIVE && !pointerInside && this.longPressTimeout !== undefined) {
+      clearTimeout(this.longPressTimeout);
+      this.longPressTimeout = undefined;
+    } else if (
+    // cancel longpress timeout if it's set and the gesture has finished
+    this.longPressTimeout !== undefined && (state === _State.State.END || state === _State.State.CANCELLED || state === _State.State.FAILED)) {
+      clearTimeout(this.longPressTimeout);
+      this.longPressTimeout = undefined;
+    }
+    this.lastActive = active;
+  };
+  onLongPress = () => {
+    var _this$props$onLongPre, _this$props;
+    this.longPressDetected = true;
+    (_this$props$onLongPre = (_this$props = this.props).onLongPress) === null || _this$props$onLongPre === void 0 || _this$props$onLongPre.call(_this$props);
+  };
+
+  // Normally, the parent would execute it's handler first, then forward the
+  // event to listeners. However, here our handler is virtually only forwarding
+  // events to listeners, so we reverse the order to keep the proper order of
+  // the callbacks (from "raw" ones to "processed").
+  onHandlerStateChange = e => {
+    var _this$props$onHandler, _this$props2;
+    (_this$props$onHandler = (_this$props2 = this.props).onHandlerStateChange) === null || _this$props$onHandler === void 0 || _this$props$onHandler.call(_this$props2, e);
+    this.handleEvent(e);
+  };
+  onGestureEvent = e => {
+    var _this$props$onGesture, _this$props3;
+    (_this$props$onGesture = (_this$props3 = this.props).onGestureEvent) === null || _this$props$onGesture === void 0 || _this$props$onGesture.call(_this$props3, e);
+    this.handleEvent(e); // TODO: maybe it is not correct
+  };
   render() {
     const {
       rippleColor,
@@ -122,17 +100,9 @@ class BaseButton extends React.Component {
       onHandlerStateChange: this.onHandlerStateChange
     }));
   }
-
 }
-
 exports.BaseButton = BaseButton;
-
-_defineProperty(BaseButton, "defaultProps", {
-  delayLongPress: 600
-});
-
 const AnimatedBaseButton = _reactNative.Animated.createAnimatedComponent(BaseButton);
-
 const btnStyles = _reactNative.StyleSheet.create({
   underlay: {
     position: 'absolute',
@@ -142,35 +112,29 @@ const btnStyles = _reactNative.StyleSheet.create({
     top: 0
   }
 });
-
 class RectButton extends React.Component {
+  static defaultProps = {
+    activeOpacity: 0.105,
+    underlayColor: 'black'
+  };
   constructor(props) {
     super(props);
-
-    _defineProperty(this, "opacity", void 0);
-
-    _defineProperty(this, "onActiveStateChange", active => {
-      var _this$props$onActiveS, _this$props4;
-
-      if (_reactNative.Platform.OS !== 'android') {
-        this.opacity.setValue(active ? this.props.activeOpacity : 0);
-      }
-
-      (_this$props$onActiveS = (_this$props4 = this.props).onActiveStateChange) === null || _this$props$onActiveS === void 0 ? void 0 : _this$props$onActiveS.call(_this$props4, active);
-    });
-
     this.opacity = new _reactNative.Animated.Value(0);
   }
-
+  onActiveStateChange = active => {
+    var _this$props$onActiveS, _this$props4;
+    if (_reactNative.Platform.OS !== 'android') {
+      this.opacity.setValue(active ? this.props.activeOpacity : 0);
+    }
+    (_this$props$onActiveS = (_this$props4 = this.props).onActiveStateChange) === null || _this$props$onActiveS === void 0 || _this$props$onActiveS.call(_this$props4, active);
+  };
   render() {
     const {
       children,
       style,
       ...rest
     } = this.props;
-
-    const resolvedStyle = _reactNative.StyleSheet.flatten(style !== null && style !== void 0 ? style : {});
-
+    const resolvedStyle = _reactNative.StyleSheet.flatten(style ?? {});
     return /*#__PURE__*/React.createElement(BaseButton, _extends({}, rest, {
       style: resolvedStyle,
       onActiveStateChange: this.onActiveStateChange
@@ -186,35 +150,24 @@ class RectButton extends React.Component {
       }]
     }), children);
   }
-
 }
-
 exports.RectButton = RectButton;
-
-_defineProperty(RectButton, "defaultProps", {
-  activeOpacity: 0.105,
-  underlayColor: 'black'
-});
-
 class BorderlessButton extends React.Component {
+  static defaultProps = {
+    activeOpacity: 0.3,
+    borderless: true
+  };
   constructor(props) {
     super(props);
-
-    _defineProperty(this, "opacity", void 0);
-
-    _defineProperty(this, "onActiveStateChange", active => {
-      var _this$props$onActiveS2, _this$props5;
-
-      if (_reactNative.Platform.OS !== 'android') {
-        this.opacity.setValue(active ? this.props.activeOpacity : 1);
-      }
-
-      (_this$props$onActiveS2 = (_this$props5 = this.props).onActiveStateChange) === null || _this$props$onActiveS2 === void 0 ? void 0 : _this$props$onActiveS2.call(_this$props5, active);
-    });
-
     this.opacity = new _reactNative.Animated.Value(1);
   }
-
+  onActiveStateChange = active => {
+    var _this$props$onActiveS2, _this$props5;
+    if (_reactNative.Platform.OS !== 'android') {
+      this.opacity.setValue(active ? this.props.activeOpacity : 1);
+    }
+    (_this$props$onActiveS2 = (_this$props5 = this.props).onActiveStateChange) === null || _this$props$onActiveS2 === void 0 || _this$props$onActiveS2.call(_this$props5, active);
+  };
   render() {
     const {
       children,
@@ -228,13 +181,6 @@ class BorderlessButton extends React.Component {
       }]
     }), children);
   }
-
 }
-
 exports.BorderlessButton = BorderlessButton;
-
-_defineProperty(BorderlessButton, "defaultProps", {
-  activeOpacity: 0.3,
-  borderless: true
-});
 //# sourceMappingURL=GestureButtons.js.map