@wavemaker-ai/app-rn-runtime 1.0.0-rc.324 → 1.0.0-rc.328

package/components/advanced/offline-banner/offline-banner.component.js

@@ -0,0 +1,68 @@
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+import React from 'react';
+import { View } from 'react-native';
+import WmPicture from '@wavemaker-ai/app-rn-runtime/components/basic/picture/picture.component';
+import WmLabel from '@wavemaker-ai/app-rn-runtime/components/basic/label/label.component';
+import injector from '@wavemaker-ai/app-rn-runtime/core/injector';
+import WmButton from '@wavemaker-ai/app-rn-runtime/components/basic/button/button.component';
+import { BaseComponent, BaseComponentState } from '@wavemaker-ai/app-rn-runtime/core/base.component';
+import WmOfflineBannerProps from './offline-banner.props';
+import { DEFAULT_CLASS } from './offline-banner.styles';
+import { SafeAreaInsetsContext } from 'react-native-safe-area-context';
+import { AccessibilityWidgetType, getAccessibilityProps } from '@wavemaker-ai/app-rn-runtime/core/accessibility';
+class WMOfflineBannerState extends BaseComponentState {}
+class OfflineBanner extends BaseComponent {
+  constructor(props) {
+    super(props, DEFAULT_CLASS, new WmOfflineBannerProps(), new WMOfflineBannerState());
+  }
+  renderWidget(props) {
+    var _appConfig$appLocale;
+    const appConfig = injector.get('APP_CONFIG');
+    const appLocale = (appConfig === null || appConfig === void 0 || (_appConfig$appLocale = appConfig.appLocale) === null || _appConfig$appLocale === void 0 ? void 0 : _appConfig$appLocale.messages) || {};
+    return /*#__PURE__*/React.createElement(SafeAreaInsetsContext.Consumer, null, (insets = {
+      top: 0,
+      bottom: 0,
+      left: 0,
+      right: 0
+    }) => {
+      var _appConfig$preference, _appConfig$preference2, _appConfig$preference3, _appConfig$preference4;
+      return /*#__PURE__*/React.createElement(View, _extends({
+        style: [{
+          paddingTop: insets === null || insets === void 0 ? void 0 : insets.top,
+          paddingBottom: insets === null || insets === void 0 ? void 0 : insets.bottom
+        }, this.styles.root]
+      }, getAccessibilityProps(AccessibilityWidgetType.OFFLINE_BANNER, {
+        accessibilitylabel: 'You are currently offline',
+        hint: 'Connection status notification'
+      })), /*#__PURE__*/React.createElement(View, {
+        style: this.styles.infoContainer
+      }, /*#__PURE__*/React.createElement(View, {
+        style: this.styles.imageContainer
+      }, /*#__PURE__*/React.createElement(WmPicture, {
+        picturesource: appConfig === null || appConfig === void 0 || (_appConfig$preference = appConfig.preferences) === null || _appConfig$preference === void 0 ? void 0 : _appConfig$preference.offlineImage,
+        resizemode: "contain",
+        name: "offline_picture",
+        classname: "offline-banner-image"
+      })), /*#__PURE__*/React.createElement(View, {
+        style: this.styles.textContainer
+      }, /*#__PURE__*/React.createElement(WmLabel, {
+        caption: appLocale.LABEL_OFFLINE_TITLE || (appConfig === null || appConfig === void 0 || (_appConfig$preference2 = appConfig.preferences) === null || _appConfig$preference2 === void 0 ? void 0 : _appConfig$preference2.offlineTitle) || 'No Internet connection',
+        classname: "offline-banner-message"
+      }), /*#__PURE__*/React.createElement(WmLabel, {
+        caption: appLocale.MESSAGE_OFFLINE_DESCRIPTION || (appConfig === null || appConfig === void 0 || (_appConfig$preference3 = appConfig.preferences) === null || _appConfig$preference3 === void 0 ? void 0 : _appConfig$preference3.offlineMessage) || 'You appear to be offline. Please check your internet connection.',
+        classname: "offline-banner-description"
+      }))), /*#__PURE__*/React.createElement(View, {
+        style: this.styles.buttonContainer
+      }, /*#__PURE__*/React.createElement(WmButton, {
+        caption: appLocale.LABEL_OFFLINE_RETRY || (appConfig === null || appConfig === void 0 || (_appConfig$preference4 = appConfig.preferences) === null || _appConfig$preference4 === void 0 ? void 0 : _appConfig$preference4.offlineRetry) || 'Try Again',
+        classname: "offline-banner-retry-button",
+        onTap: () => {
+          props.onRetry();
+        }
+      })));
+    });
+  }
+}
+;
+export default OfflineBanner;
+//# sourceMappingURL=offline-banner.component.js.map

package/components/advanced/offline-banner/offline-banner.component.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","View","WmPicture","WmLabel","injector","WmButton","BaseComponent","BaseComponentState","WmOfflineBannerProps","DEFAULT_CLASS","SafeAreaInsetsContext","AccessibilityWidgetType","getAccessibilityProps","WMOfflineBannerState","OfflineBanner","constructor","props","renderWidget","_appConfig$appLocale","appConfig","get","appLocale","messages","createElement","Consumer","insets","top","bottom","left","right","_appConfig$preference","_appConfig$preference2","_appConfig$preference3","_appConfig$preference4","_extends","style","paddingTop","paddingBottom","styles","root","OFFLINE_BANNER","accessibilitylabel","hint","infoContainer","imageContainer","picturesource","preferences","offlineImage","resizemode","name","classname","textContainer","caption","LABEL_OFFLINE_TITLE","offlineTitle","MESSAGE_OFFLINE_DESCRIPTION","offlineMessage","buttonContainer","LABEL_OFFLINE_RETRY","offlineRetry","onTap","onRetry"],"sources":["offline-banner.component.tsx"],"sourcesContent":["import React from 'react';\nimport {  Alert, View } from 'react-native';\nimport WmPicture from '@wavemaker-ai/app-rn-runtime/components/basic/picture/picture.component';\nimport WmLabel from '@wavemaker-ai/app-rn-runtime/components/basic/label/label.component';\nimport AppConfig from '@wavemaker-ai/app-rn-runtime/core/AppConfig';\nimport injector from '@wavemaker-ai/app-rn-runtime/core/injector';\nimport WmButton from '@wavemaker-ai/app-rn-runtime/components/basic/button/button.component';\nimport { BaseComponent, BaseComponentState, BaseProps } from '@wavemaker-ai/app-rn-runtime/core/base.component';\nimport WmOfflineBannerProps from './offline-banner.props';\nimport { DEFAULT_CLASS, WmOfflineBannerStyles } from './offline-banner.styles';\nimport {  SafeAreaInsetsContext } from 'react-native-safe-area-context';\nimport { AccessibilityWidgetType, getAccessibilityProps } from '@wavemaker-ai/app-rn-runtime/core/accessibility';\n\nclass WMOfflineBannerState extends BaseComponentState<WmOfflineBannerProps> {}\n\nclass OfflineBanner extends BaseComponent<WmOfflineBannerProps, WMOfflineBannerState, WmOfflineBannerStyles> {\n  constructor(props: WmOfflineBannerProps) {\n    super(props, DEFAULT_CLASS, new WmOfflineBannerProps(), new WMOfflineBannerState());\n  }\n\n  renderWidget(props: WmOfflineBannerProps) {\n\n    const appConfig = injector.get<AppConfig>('APP_CONFIG');\n    const appLocale = appConfig?.appLocale?.messages || {};\n\n    return  <SafeAreaInsetsContext.Consumer>\n      {(insets = { top: 0, bottom: 0, left: 0, right: 0 }) => {\n      return (\n        <View\n        style={[\n          { paddingTop: insets?.top, paddingBottom: insets?.bottom },\n          this.styles.root,\n        ]}\n        {...getAccessibilityProps(AccessibilityWidgetType.OFFLINE_BANNER, {\n          accessibilitylabel: 'You are currently offline',\n          hint: 'Connection status notification'\n        })}\n      >\n      <View style={this.styles.infoContainer}>\n\n      <View style={this.styles.imageContainer}>\n      <WmPicture\n         picturesource={appConfig?.preferences?.offlineImage}\n         resizemode=\"contain\"\n         name=\"offline_picture\"\n         classname='offline-banner-image'\n         />\n      </View>\n      <View style={this.styles.textContainer}>\n      <WmLabel\n        caption={appLocale.LABEL_OFFLINE_TITLE || appConfig?.preferences?.offlineTitle || 'No Internet connection'}\n        classname='offline-banner-message'\n        />\n      <WmLabel\n        caption={appLocale.MESSAGE_OFFLINE_DESCRIPTION || appConfig?.preferences?.offlineMessage || 'You appear to be offline. Please check your internet connection.'}\n        classname='offline-banner-description'\n        />\n      </View>\n      </View>\n      <View style={this.styles.buttonContainer}>\n      <WmButton\n        caption={appLocale.LABEL_OFFLINE_RETRY || appConfig?.preferences?.offlineRetry || 'Try Again'}\n      classname={\"offline-banner-retry-button\"}\n      onTap={() => {\n        props.onRetry();\n       }}\n     />\n     </View>\n     </View> )\n    }}\n    </SafeAreaInsetsContext.Consumer>\n  }\n};\n\nexport default OfflineBanner;"],"mappings":"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","ignoreList":[]}

package/components/advanced/offline-banner/offline-banner.props.js

@@ -0,0 +1,12 @@
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { BaseProps } from '@wavemaker-ai/app-rn-runtime/core/base.component';
+export default class WmOfflineBannerProps extends BaseProps {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "onRetry", null);
+    _defineProperty(this, "message", 'No Internet Connection');
+  }
+}
+//# sourceMappingURL=offline-banner.props.js.map

package/components/advanced/offline-banner/offline-banner.props.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["BaseProps","WmOfflineBannerProps","constructor","args","_defineProperty"],"sources":["offline-banner.props.ts"],"sourcesContent":["import { BaseProps } from '@wavemaker-ai/app-rn-runtime/core/base.component';\n\nexport default class WmOfflineBannerProps extends BaseProps {\n  onRetry: () => void = null as any;\n  message?: string = 'No Internet Connection';\n}\n"],"mappings":";;;AAAA,SAASA,SAAS,QAAQ,kDAAkD;AAE5E,eAAe,MAAMC,oBAAoB,SAASD,SAAS,CAAC;EAAAE,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAAC,eAAA,kBACpC,IAAI;IAAAA,eAAA,kBACP,wBAAwB;EAAA;AAC7C","ignoreList":[]}

package/components/advanced/offline-banner/offline-banner.styles.js

@@ -0,0 +1,99 @@
+import BASE_THEME from '@wavemaker-ai/app-rn-runtime/styles/theme';
+import { defineStyles } from '@wavemaker-ai/app-rn-runtime/core/base.component';
+export const DEFAULT_CLASS = 'app-offline-banner';
+BASE_THEME.registerStyle((themeVariables, addStyle) => {
+  const defaultStyles = defineStyles({
+    root: {
+      flex: 1,
+      paddingHorizontal: 20,
+      backgroundColor: '#fff',
+      justifyContent: 'center'
+    },
+    textContainer: {},
+    text: {},
+    infoContainer: {
+      flex: 1,
+      width: '100%',
+      justifyContent: 'center'
+    },
+    imageContainer: {
+      alignItems: 'center',
+      marginVertical: 24
+    },
+    errorImage: {
+      width: '80%',
+      maxWidth: 150,
+      height: undefined,
+      aspectRatio: 1.2,
+      maxHeight: 150,
+      alignSelf: 'center'
+    },
+    title: {
+      fontSize: 24,
+      fontWeight: '700',
+      textAlign: 'center',
+      color: '#2d3748',
+      marginBottom: 8
+    },
+    subtitle: {
+      fontSize: 14,
+      textAlign: 'center',
+      color: '#71717A',
+      marginBottom: 24,
+      fontWeight: '400'
+    },
+    buttonContainer: {
+      width: '100%',
+      maxWidth: 400,
+      alignSelf: 'center',
+      marginTop: 24,
+      marginBottom: 16
+    }
+  });
+  addStyle(DEFAULT_CLASS, '', defaultStyles);
+  addStyle('offline-banner-image', '', {
+    root: {
+      width: '80%',
+      maxWidth: 150,
+      height: undefined,
+      aspectRatio: 1.2,
+      maxHeight: 150,
+      alignSelf: 'center'
+    }
+  });
+  addStyle('offline-banner-message', '', {
+    root: {
+      alignSelf: 'center'
+    },
+    text: defaultStyles.title
+  });
+  addStyle('offline-banner-description', '', {
+    root: {
+      alignSelf: 'center'
+    },
+    text: defaultStyles.subtitle
+  });
+  addStyle('offline-banner-retry-button', '', {
+    root: {
+      backgroundColor: themeVariables.buttonPrimaryColor,
+      borderRadius: 12,
+      paddingVertical: 16,
+      paddingHorizontal: 24,
+      alignItems: 'center',
+      alignSelf: 'center',
+      width: '100%'
+    },
+    text: {
+      color: '#ffffff',
+      fontWeight: '700',
+      fontSize: 16,
+      lineHeight: 24,
+      textAlign: 'center'
+    },
+    badge: {
+      backgroundColor: '#ffffff',
+      color: '#3498db'
+    }
+  });
+});
+//# sourceMappingURL=offline-banner.styles.js.map

package/components/advanced/offline-banner/offline-banner.styles.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["BASE_THEME","defineStyles","DEFAULT_CLASS","registerStyle","themeVariables","addStyle","defaultStyles","root","flex","paddingHorizontal","backgroundColor","justifyContent","textContainer","text","infoContainer","width","imageContainer","alignItems","marginVertical","errorImage","maxWidth","height","undefined","aspectRatio","maxHeight","alignSelf","title","fontSize","fontWeight","textAlign","color","marginBottom","subtitle","buttonContainer","marginTop","buttonPrimaryColor","borderRadius","paddingVertical","lineHeight","badge"],"sources":["offline-banner.styles.ts"],"sourcesContent":["import { WmSkeletonStyles } from '../../basic/skeleton/skeleton.styles';\nimport BASE_THEME, { AllStyle } from '@wavemaker-ai/app-rn-runtime/styles/theme';\nimport {\n  BaseStyles,\n  defineStyles,\n} from '@wavemaker-ai/app-rn-runtime/core/base.component';\nimport { WmLabelStyles } from '@wavemaker-ai/app-rn-runtime/components/basic/label/label.styles';\nimport { WmButtonStyles } from '@wavemaker-ai/app-rn-runtime/components/basic/button/button.styles';\n\nexport type WmOfflineBannerStyles = BaseStyles & {\n  imageContainer: AllStyle;\n  textContainer: AllStyle;\n  infoContainer: AllStyle;\n  errorImage: AllStyle;\n  title: AllStyle;\n  subtitle: AllStyle;\n  buttonContainer: AllStyle;\n};\n\nexport const DEFAULT_CLASS = 'app-offline-banner';\n\nBASE_THEME.registerStyle((themeVariables, addStyle) => {\n  const defaultStyles: WmOfflineBannerStyles = defineStyles({\n    root: {\n      flex: 1,\n      paddingHorizontal: 20,\n      backgroundColor: '#fff',\n      justifyContent: 'center',\n    },\n    textContainer: {\n    },\n    text: {},\n    infoContainer: {\n      flex: 1,\n      width: '100%',\n      justifyContent: 'center',\n    },\n    imageContainer: {\n      alignItems: 'center',\n      marginVertical: 24,\n    },\n    errorImage: {\n      width: '80%',\n      maxWidth: 150,\n      height: undefined,\n      aspectRatio: 1.2,\n      maxHeight: 150,\n      alignSelf: 'center',\n    },\n    title: {\n      fontSize: 24,\n      fontWeight: '700',\n      textAlign: 'center',\n      color: '#2d3748',\n      marginBottom: 8,\n    },\n    subtitle: {\n      fontSize: 14,\n      textAlign: 'center',\n      color: '#71717A',\n      marginBottom: 24,\n      fontWeight: '400',\n    },\n    buttonContainer: {\n      width: '100%',\n      maxWidth: 400,\n      alignSelf: 'center',\n      marginTop: 24,\n      marginBottom: 16,\n    },\n  })\n\n  addStyle(DEFAULT_CLASS, '', defaultStyles);\n\n  addStyle('offline-banner-image', '', {\n    root: {\n      width: '80%',\n      maxWidth: 150,\n      height: undefined,\n      aspectRatio: 1.2,\n      maxHeight: 150,\n      alignSelf: 'center',  \n    } as any\n  });\n\n  addStyle('offline-banner-message', '', {\n    root: { alignSelf: 'center' },\n    text: defaultStyles.title,\n  } as WmLabelStyles);\n\n  addStyle('offline-banner-description', '', {\n    root: { alignSelf: 'center' },\n    text: defaultStyles.subtitle,\n  } as WmLabelStyles);\n\n  addStyle('offline-banner-retry-button', '', {\n    root: {\n      backgroundColor: themeVariables.buttonPrimaryColor,\n      borderRadius: 12,\n      paddingVertical: 16,\n      paddingHorizontal: 24,\n      alignItems: 'center',\n      alignSelf: 'center',\n      width: '100%',\n    },\n    text: {\n      color: '#ffffff',\n      fontWeight: '700',\n      fontSize: 16,\n      lineHeight: 24,\n      textAlign: 'center',\n    },\n    badge: {\n      backgroundColor: '#ffffff',\n      color: '#3498db',\n    }\n  });\n\n});\n\n\n"],"mappings":"AACA,OAAOA,UAAU,MAAoB,2CAA2C;AAChF,SAEEC,YAAY,QACP,kDAAkD;AAczD,OAAO,MAAMC,aAAa,GAAG,oBAAoB;AAEjDF,UAAU,CAACG,aAAa,CAAC,CAACC,cAAc,EAAEC,QAAQ,KAAK;EACrD,MAAMC,aAAoC,GAAGL,YAAY,CAAC;IACxDM,IAAI,EAAE;MACJC,IAAI,EAAE,CAAC;MACPC,iBAAiB,EAAE,EAAE;MACrBC,eAAe,EAAE,MAAM;MACvBC,cAAc,EAAE;IAClB,CAAC;IACDC,aAAa,EAAE,CACf,CAAC;IACDC,IAAI,EAAE,CAAC,CAAC;IACRC,aAAa,EAAE;MACbN,IAAI,EAAE,CAAC;MACPO,KAAK,EAAE,MAAM;MACbJ,cAAc,EAAE;IAClB,CAAC;IACDK,cAAc,EAAE;MACdC,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IAClB,CAAC;IACDC,UAAU,EAAE;MACVJ,KAAK,EAAE,KAAK;MACZK,QAAQ,EAAE,GAAG;MACbC,MAAM,EAAEC,SAAS;MACjBC,WAAW,EAAE,GAAG;MAChBC,SAAS,EAAE,GAAG;MACdC,SAAS,EAAE;IACb,CAAC;IACDC,KAAK,EAAE;MACLC,QAAQ,EAAE,EAAE;MACZC,UAAU,EAAE,KAAK;MACjBC,SAAS,EAAE,QAAQ;MACnBC,KAAK,EAAE,SAAS;MAChBC,YAAY,EAAE;IAChB,CAAC;IACDC,QAAQ,EAAE;MACRL,QAAQ,EAAE,EAAE;MACZE,SAAS,EAAE,QAAQ;MACnBC,KAAK,EAAE,SAAS;MAChBC,YAAY,EAAE,EAAE;MAChBH,UAAU,EAAE;IACd,CAAC;IACDK,eAAe,EAAE;MACflB,KAAK,EAAE,MAAM;MACbK,QAAQ,EAAE,GAAG;MACbK,SAAS,EAAE,QAAQ;MACnBS,SAAS,EAAE,EAAE;MACbH,YAAY,EAAE;IAChB;EACF,CAAC,CAAC;EAEF1B,QAAQ,CAACH,aAAa,EAAE,EAAE,EAAEI,aAAa,CAAC;EAE1CD,QAAQ,CAAC,sBAAsB,EAAE,EAAE,EAAE;IACnCE,IAAI,EAAE;MACJQ,KAAK,EAAE,KAAK;MACZK,QAAQ,EAAE,GAAG;MACbC,MAAM,EAAEC,SAAS;MACjBC,WAAW,EAAE,GAAG;MAChBC,SAAS,EAAE,GAAG;MACdC,SAAS,EAAE;IACb;EACF,CAAC,CAAC;EAEFpB,QAAQ,CAAC,wBAAwB,EAAE,EAAE,EAAE;IACrCE,IAAI,EAAE;MAAEkB,SAAS,EAAE;IAAS,CAAC;IAC7BZ,IAAI,EAAEP,aAAa,CAACoB;EACtB,CAAkB,CAAC;EAEnBrB,QAAQ,CAAC,4BAA4B,EAAE,EAAE,EAAE;IACzCE,IAAI,EAAE;MAAEkB,SAAS,EAAE;IAAS,CAAC;IAC7BZ,IAAI,EAAEP,aAAa,CAAC0B;EACtB,CAAkB,CAAC;EAEnB3B,QAAQ,CAAC,6BAA6B,EAAE,EAAE,EAAE;IAC1CE,IAAI,EAAE;MACJG,eAAe,EAAEN,cAAc,CAAC+B,kBAAkB;MAClDC,YAAY,EAAE,EAAE;MAChBC,eAAe,EAAE,EAAE;MACnB5B,iBAAiB,EAAE,EAAE;MACrBQ,UAAU,EAAE,QAAQ;MACpBQ,SAAS,EAAE,QAAQ;MACnBV,KAAK,EAAE;IACT,CAAC;IACDF,IAAI,EAAE;MACJiB,KAAK,EAAE,SAAS;MAChBF,UAAU,EAAE,KAAK;MACjBD,QAAQ,EAAE,EAAE;MACZW,UAAU,EAAE,EAAE;MACdT,SAAS,EAAE;IACb,CAAC;IACDU,KAAK,EAAE;MACL7B,eAAe,EAAE,SAAS;MAC1BoB,KAAK,EAAE;IACT;EACF,CAAC,CAAC;AAEJ,CAAC,CAAC","ignoreList":[]}

package/components/advanced/webview/webview.component.js

@@ -139,9 +139,9 @@ export default class WmWebview extends BaseComponent {
       containerStyle: this.styles.webview
       // style={this.styles.webview} // when using style, there are some inconsistencies observed in Android. containerStyle gives us a uniformity in IOS and Android.
       ,
-      source: {
+      source: props.src ? {
         uri: props.src
-      },
+      } : undefined,
       testID: this.getTestId('web_view')
     }, getAccessibilityProps(AccessibilityWidgetType.WEBVIEW, props), {
       incognito: props.incognito,

package/components/advanced/webview/webview.component.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","BackHandler","Platform","View","WebView","HideMode","BaseComponent","BaseComponentState","WmWebviewProps","DEFAULT_CLASS","AccessibilityWidgetType","getAccessibilityProps","isAndroid","isWebPreviewMode","WmWebViewState","constructor","args","_defineProperty","title","src","WmWebview","props","webview","webViewState","canGoBack","goBack","event","_event$nativeEvent","data","nativeEvent","startsWith","id","match","callback","invokeJSCallbacks","result","substring","indexOf","parseResult","invokeEventCallback","hideMode","DONOT_ADD_TO_DOM","backHandlerSubscription","addEventListener","handleBackButtonPress","componentWillUnmount","remove","_this$state$currentTa","state","currentTarget","currentsrc","_this$state$currentTa2","executeScript","fn","Promise","resolve","reject","Date","now","injectJavaScript","insertCSS","style","replace","JSON","parse","e","getTitle","iframe","contentWindow","document","onLoad","updateState","renderWidget","createElement","styles","root","onLayout","handleLayout","_background","OS","width","height","_extends","ref","nestedScrollEnabled","containerStyle","source","uri","testID","getTestId","WEBVIEW","incognito","onMessage","sharedCookiesEnabled","onNavigationStateChange","scrollEnabled","onLoadEnd","url","allowsFullscreenVideo","allowsInlineMediaPlayback"],"sources":["webview.component.tsx"],"sourcesContent":["import React from 'react';\nimport { BackHandler, Platform, View, NativeEventSubscription } from 'react-native';\nimport { WebView, WebViewNavigation, WebViewMessageEvent } from 'react-native-webview';\nimport { HideMode } from '@wavemaker-ai/app-rn-runtime/core/if.component';\nimport { BaseComponent, BaseComponentState } from '@wavemaker-ai/app-rn-runtime/core/base.component';\n\nimport WmWebviewProps from './webview.props';\nimport { DEFAULT_CLASS, WebviewStyles } from './webview.styles';\nimport { AccessibilityWidgetType, getAccessibilityProps } from '@wavemaker-ai/app-rn-runtime/core/accessibility';\nimport { isAndroid, isWebPreviewMode } from '@wavemaker-ai/app-rn-runtime/core/utils';\n\nclass WmWebViewState extends BaseComponentState<WmWebviewProps> {\n  currentTarget = {\n    title: '',\n    src: ''\n  };\n\n}\n\nexport default class WmWebview extends BaseComponent<WmWebviewProps, WmWebViewState, WebviewStyles> {\n\n  private webview: WebView | null = null as any;\n  private webViewState: WebViewNavigation = null as any;\n  private invokeJSCallbacks = {} as any;\n  private backHandlerSubscription: NativeEventSubscription | null = null;\n\n  constructor(props: WmWebviewProps) {\n    super(props, DEFAULT_CLASS, new WmWebviewProps());\n    this.hideMode = HideMode.DONOT_ADD_TO_DOM;\n    if (isAndroid() && !isWebPreviewMode()) {\n      this.backHandlerSubscription = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress);\n    }\n  }\n\n  componentWillUnmount() {\n    super.componentWillUnmount();\n    if (this.backHandlerSubscription) {\n      this.backHandlerSubscription.remove();\n      this.backHandlerSubscription = null;\n    }\n  }\n\n  handleBackButtonPress = (): boolean => {\n    if (this.webview && this.webViewState && this.webViewState.canGoBack) {\n      this.webview.goBack();\n      return true;\n    }\n    return false;\n  }\n\n  get title() {\n    return this.state.currentTarget?.title;\n  }\n\n  get currentsrc() {\n    return this.state.currentTarget?.src;\n  }\n\n  executeScript(fn: string) {\n    return new Promise((resolve, reject) => {\n      if (this.webview) {\n        const id = '' + Date.now();\n        this.invokeJSCallbacks[id] = resolve;\n        fn = `\n         (function(){\n          try{\n            return (${fn});\n          } catch(e) {\n            return e.getMessage();\n          }\n         }())\n        `;\n        this.webview.injectJavaScript(\n          `window.ReactNativeWebView.postMessage('afterInjectJavaScript:' + ${id} + ':' + JSON.stringify(${fn}))`\n        );\n      } else {\n        reject();\n      }\n    });\n  }\n\n  insertCSS(style = '') {\n    style = style.replace(/[\\n\\t\\r]/g, '');\n    return this.executeScript(`\n    function() {\n      const style = document.createElement('style');\n      style.innerHTML = '${style}';\n      document.head.appendChild(style);\n      return 'SUCCESS';\n    }()\n    `);\n  }\n\n  parseResult(result: string) {\n    try {\n      return JSON.parse(result);\n    } catch(e) {\n      if (result === 'undefined' || result === 'null') {\n        return null;\n      }\n      return result;\n    }\n  }\n\n  onMessage = (event: WebViewMessageEvent) => {\n    const data: string = event.nativeEvent?.data;\n    if (data && data.startsWith('afterInjectJavaScript')) {\n      const id = data?.match(/\\:([0-9]+)\\:/);\n      const callback = id && this.invokeJSCallbacks[id[1]];\n      const result = data.substring(data.indexOf(':', data.indexOf(':') + 1) + 1);\n      callback && callback(this.parseResult(result));\n    } else {\n      this.invokeEventCallback('onMessage', [event, this]);\n    }\n  }\n\n  getTitle(iframe: any) {\n    try {\n      return iframe.currentTarget.contentWindow.document.title;\n    } catch(e) {\n      // browser blocks cross origin access to iframe content.\n    }\n  }\n\n  public onLoad(e: any, title: string, src: string) {\n    this.updateState({\n      currentTarget: {\n        title: title,\n        src: src\n      }\n    } as WmWebViewState, () => {\n      this.invokeEventCallback('onLoad', [e, this]);\n    });\n  }\n\n  protected renderWidget(props: WmWebviewProps) {\n    return (\n      <View\n        style={this.styles.root}\n        onLayout={(event) => this.handleLayout(event)}\n      >\n        {this._background}\n        {Platform.OS === 'web' ?\n          (<iframe src={props.src} width={'100%'} height={'100%'}\n            onLoad={(e) => this.onLoad(e, this.getTitle(e.currentTarget), (e.currentTarget as any).src)}></iframe>) :\n          (<WebView\n            ref={(ref) => this.webview = ref}\n            nestedScrollEnabled={true}\n            containerStyle = {this.styles.webview}\n            // style={this.styles.webview} // when using style, there are some inconsistencies observed in Android. containerStyle gives us a uniformity in IOS and Android.\n            source={{\n              uri: props.src\n            }}\n            testID={this.getTestId('web_view')}\n            {...getAccessibilityProps(AccessibilityWidgetType.WEBVIEW, props)}\n            incognito={props.incognito}\n            onMessage={this.onMessage}\n            sharedCookiesEnabled={true}\n            onNavigationStateChange={(state) => {\n              this.webViewState = state;\n            }}\n            scrollEnabled={true}\n            onLoadEnd={(e) => this.onLoad(e, e.nativeEvent.title, e.nativeEvent.url)}\n            allowsFullscreenVideo={true}\n            allowsInlineMediaPlayback={true}\n          >\n          </WebView>)}\n      </View>\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","BackHandler","Platform","View","WebView","HideMode","BaseComponent","BaseComponentState","WmWebviewProps","DEFAULT_CLASS","AccessibilityWidgetType","getAccessibilityProps","isAndroid","isWebPreviewMode","WmWebViewState","constructor","args","_defineProperty","title","src","WmWebview","props","webview","webViewState","canGoBack","goBack","event","_event$nativeEvent","data","nativeEvent","startsWith","id","match","callback","invokeJSCallbacks","result","substring","indexOf","parseResult","invokeEventCallback","hideMode","DONOT_ADD_TO_DOM","backHandlerSubscription","addEventListener","handleBackButtonPress","componentWillUnmount","remove","_this$state$currentTa","state","currentTarget","currentsrc","_this$state$currentTa2","executeScript","fn","Promise","resolve","reject","Date","now","injectJavaScript","insertCSS","style","replace","JSON","parse","e","getTitle","iframe","contentWindow","document","onLoad","updateState","renderWidget","createElement","styles","root","onLayout","handleLayout","_background","OS","width","height","_extends","ref","nestedScrollEnabled","containerStyle","source","uri","undefined","testID","getTestId","WEBVIEW","incognito","onMessage","sharedCookiesEnabled","onNavigationStateChange","scrollEnabled","onLoadEnd","url","allowsFullscreenVideo","allowsInlineMediaPlayback"],"sources":["webview.component.tsx"],"sourcesContent":["import React from 'react';\nimport { BackHandler, Platform, View, NativeEventSubscription } from 'react-native';\nimport { WebView, WebViewNavigation, WebViewMessageEvent } from 'react-native-webview';\nimport { HideMode } from '@wavemaker-ai/app-rn-runtime/core/if.component';\nimport { BaseComponent, BaseComponentState } from '@wavemaker-ai/app-rn-runtime/core/base.component';\n\nimport WmWebviewProps from './webview.props';\nimport { DEFAULT_CLASS, WebviewStyles } from './webview.styles';\nimport { AccessibilityWidgetType, getAccessibilityProps } from '@wavemaker-ai/app-rn-runtime/core/accessibility';\nimport { isAndroid, isWebPreviewMode } from '@wavemaker-ai/app-rn-runtime/core/utils';\n\nclass WmWebViewState extends BaseComponentState<WmWebviewProps> {\n  currentTarget = {\n    title: '',\n    src: ''\n  };\n\n}\n\nexport default class WmWebview extends BaseComponent<WmWebviewProps, WmWebViewState, WebviewStyles> {\n\n  private webview: WebView | null = null as any;\n  private webViewState: WebViewNavigation = null as any;\n  private invokeJSCallbacks = {} as any;\n  private backHandlerSubscription: NativeEventSubscription | null = null;\n\n  constructor(props: WmWebviewProps) {\n    super(props, DEFAULT_CLASS, new WmWebviewProps());\n    this.hideMode = HideMode.DONOT_ADD_TO_DOM;\n    if (isAndroid() && !isWebPreviewMode()) {\n      this.backHandlerSubscription = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress);\n    }\n  }\n\n  componentWillUnmount() {\n    super.componentWillUnmount();\n    if (this.backHandlerSubscription) {\n      this.backHandlerSubscription.remove();\n      this.backHandlerSubscription = null;\n    }\n  }\n\n  handleBackButtonPress = (): boolean => {\n    if (this.webview && this.webViewState && this.webViewState.canGoBack) {\n      this.webview.goBack();\n      return true;\n    }\n    return false;\n  }\n\n  get title() {\n    return this.state.currentTarget?.title;\n  }\n\n  get currentsrc() {\n    return this.state.currentTarget?.src;\n  }\n\n  executeScript(fn: string) {\n    return new Promise((resolve, reject) => {\n      if (this.webview) {\n        const id = '' + Date.now();\n        this.invokeJSCallbacks[id] = resolve;\n        fn = `\n         (function(){\n          try{\n            return (${fn});\n          } catch(e) {\n            return e.getMessage();\n          }\n         }())\n        `;\n        this.webview.injectJavaScript(\n          `window.ReactNativeWebView.postMessage('afterInjectJavaScript:' + ${id} + ':' + JSON.stringify(${fn}))`\n        );\n      } else {\n        reject();\n      }\n    });\n  }\n\n  insertCSS(style = '') {\n    style = style.replace(/[\\n\\t\\r]/g, '');\n    return this.executeScript(`\n    function() {\n      const style = document.createElement('style');\n      style.innerHTML = '${style}';\n      document.head.appendChild(style);\n      return 'SUCCESS';\n    }()\n    `);\n  }\n\n  parseResult(result: string) {\n    try {\n      return JSON.parse(result);\n    } catch(e) {\n      if (result === 'undefined' || result === 'null') {\n        return null;\n      }\n      return result;\n    }\n  }\n\n  onMessage = (event: WebViewMessageEvent) => {\n    const data: string = event.nativeEvent?.data;\n    if (data && data.startsWith('afterInjectJavaScript')) {\n      const id = data?.match(/\\:([0-9]+)\\:/);\n      const callback = id && this.invokeJSCallbacks[id[1]];\n      const result = data.substring(data.indexOf(':', data.indexOf(':') + 1) + 1);\n      callback && callback(this.parseResult(result));\n    } else {\n      this.invokeEventCallback('onMessage', [event, this]);\n    }\n  }\n\n  getTitle(iframe: any) {\n    try {\n      return iframe.currentTarget.contentWindow.document.title;\n    } catch(e) {\n      // browser blocks cross origin access to iframe content.\n    }\n  }\n\n  public onLoad(e: any, title: string, src: string) {\n    this.updateState({\n      currentTarget: {\n        title: title,\n        src: src\n      }\n    } as WmWebViewState, () => {\n      this.invokeEventCallback('onLoad', [e, this]);\n    });\n  }\n\n  protected renderWidget(props: WmWebviewProps) {\n    return (\n      <View\n        style={this.styles.root}\n        onLayout={(event) => this.handleLayout(event)}\n      >\n        {this._background}\n        {Platform.OS === 'web' ?\n          (<iframe src={props.src} width={'100%'} height={'100%'}\n            onLoad={(e) => this.onLoad(e, this.getTitle(e.currentTarget), (e.currentTarget as any).src)}></iframe>) :\n          (<WebView\n            ref={(ref) => this.webview = ref}\n            nestedScrollEnabled={true}\n            containerStyle = {this.styles.webview}\n            // style={this.styles.webview} // when using style, there are some inconsistencies observed in Android. containerStyle gives us a uniformity in IOS and Android.\n            source={props.src ? { uri: props.src } : undefined}\n            testID={this.getTestId('web_view')}\n            {...getAccessibilityProps(AccessibilityWidgetType.WEBVIEW, props)}\n            incognito={props.incognito}\n            onMessage={this.onMessage}\n            sharedCookiesEnabled={true}\n            onNavigationStateChange={(state) => {\n              this.webViewState = state;\n            }}\n            scrollEnabled={true}\n            onLoadEnd={(e) => this.onLoad(e, e.nativeEvent.title, e.nativeEvent.url)}\n            allowsFullscreenVideo={true}\n            allowsInlineMediaPlayback={true}\n          >\n          </WebView>)}\n      </View>\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/components/advanced/webview/webview.props.js

@@ -5,7 +5,7 @@ import { BaseProps } from '@wavemaker-ai/app-rn-runtime/core/base.component';
 export default class WmWebviewProps extends BaseProps {
   constructor(...args) {
     super(...args);
-    _defineProperty(this, "src", null);
+    _defineProperty(this, "src", '');
     _defineProperty(this, "incognito", false);
     _defineProperty(this, "onLoad", null);
     _defineProperty(this, "accessibilitylabel", undefined);

package/components/advanced/webview/webview.props.js.map

@@ -1 +1 @@
-{"version":3,"names":["BaseProps","WmWebviewProps","constructor","args","_defineProperty","undefined"],"sources":["webview.props.ts"],"sourcesContent":["import { BaseProps } from '@wavemaker-ai/app-rn-runtime/core/base.component';\nimport WmWebview from './webview.component';\nimport { AccessibilityRole } from 'react-native';\n\nexport default class WmWebviewProps extends BaseProps {\n  src: string = null as any;\n  incognito? = false;\n  onLoad?: ($event: any, $widget: WmWebview) => void = null as any;\n  accessibilitylabel?: string = undefined;\n  hint?: string = undefined;\n  accessibilityrole?: AccessibilityRole;\n}\n"],"mappings":";;;AAAA,SAASA,SAAS,QAAQ,kDAAkD;AAI5E,eAAe,MAAMC,cAAc,SAASD,SAAS,CAAC;EAAAE,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAAC,eAAA,cACtC,IAAI;IAAAA,eAAA,oBACL,KAAK;IAAAA,eAAA,iBACmC,IAAI;IAAAA,eAAA,6BAC3BC,SAAS;IAAAD,eAAA,eACvBC,SAAS;IAAAD,eAAA;EAAA;AAE3B","ignoreList":[]}
+{"version":3,"names":["BaseProps","WmWebviewProps","constructor","args","_defineProperty","undefined"],"sources":["webview.props.ts"],"sourcesContent":["import { BaseProps } from '@wavemaker-ai/app-rn-runtime/core/base.component';\nimport WmWebview from './webview.component';\nimport { AccessibilityRole } from 'react-native';\n\nexport default class WmWebviewProps extends BaseProps {\n  src: string = '';\n  incognito? = false;\n  onLoad?: ($event: any, $widget: WmWebview) => void = null as any;\n  accessibilitylabel?: string = undefined;\n  hint?: string = undefined;\n  accessibilityrole?: AccessibilityRole;\n}\n"],"mappings":";;;AAAA,SAASA,SAAS,QAAQ,kDAAkD;AAI5E,eAAe,MAAMC,cAAc,SAASD,SAAS,CAAC;EAAAE,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAAC,eAAA,cACtC,EAAE;IAAAA,eAAA,oBACH,KAAK;IAAAA,eAAA,iBACmC,IAAI;IAAAA,eAAA,6BAC3BC,SAAS;IAAAD,eAAA,eACvBC,SAAS;IAAAD,eAAA;EAAA;AAE3B","ignoreList":[]}

package/components/basic/bottomsheet/bottomsheet.component.js

@@ -5,8 +5,9 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import React, { createRef } from 'react';
 import { BaseComponent, BaseComponentState } from '@wavemaker-ai/app-rn-runtime/core/base.component';
 import { View, PanResponder, Dimensions, TouchableWithoutFeedback, Platform, StatusBar, BackHandler, KeyboardAvoidingView, Keyboard, Modal, Pressable } from 'react-native';
-import { ScrollView } from 'react-native-gesture-handler';
+import { Gesture, GestureDetector, GestureHandlerRootView, ScrollView } from 'react-native-gesture-handler';
 import Animated, { useAnimatedStyle, withTiming, runOnJS, Easing, makeMutable, cancelAnimation } from 'react-native-reanimated';
+import * as Animatable from 'react-native-animatable';
 import WmBottomsheetProps from './bottomsheet.props';
 import { DEFAULT_CLASS } from './bottomsheet.styles';
 import { createSkeleton } from '../skeleton/skeleton.component';
@@ -57,6 +58,8 @@ export class WmBottomsheetState extends BaseComponentState {
     _defineProperty(this, "keyboardHeight", 0);
     _defineProperty(this, "localModalsOpened", []);
     _defineProperty(this, "lastGestureDy", 0);
+    _defineProperty(this, "contentAnimationId", 0);
+    _defineProperty(this, "contentAnimatableProps", undefined);
   }
 }
 
@@ -74,8 +77,32 @@ const AnimatedBottomsheetContent = ({
   onBackdropPress,
   onDragHandlePress,
   getTestProps,
-  enabledragsettle
+  enabledragsettle,
+  scrollRef,
+  containerScrollRef,
+  configurePanGesture
 }) => {
+  // Simple RNGH GestureDetector attached to the same view as the PanResponder (panHandlers).
+  // No thresholds/validation: logs translationY directly during pan.
+  const panGesture = React.useMemo(() => {
+    // Create base Pan gesture
+    const pan = Gesture.Pan().runOnJS(true);
+
+    // Add external gestures for ScrollViews (container widget scrollview)
+    if (scrollRef && containerScrollRef) {
+      pan.simultaneousWithExternalGesture(scrollRef, containerScrollRef);
+    } else if (scrollRef) {
+      pan.simultaneousWithExternalGesture(scrollRef);
+    } else if (containerScrollRef) {
+      pan.simultaneousWithExternalGesture(containerScrollRef);
+    }
+
+    // Apply custom logic from parent BottomSheet class
+    if (configurePanGesture) {
+      configurePanGesture(pan);
+    }
+    return pan;
+  }, [scrollRef, containerScrollRef, configurePanGesture]);
   const backdropAnimatedStyle = useAnimatedStyle(() => ({
     opacity: backdropOpacity.value
   }));
@@ -97,15 +124,18 @@ const AnimatedBottomsheetContent = ({
     onPress: onBackdropPress
   }, /*#__PURE__*/React.createElement(Animated.View, _extends({
     style: [styles.backdrop, backdropAnimatedStyle]
-  }, getTestProps('backdrop'), getAccessibilityProps(AccessibilityWidgetType.BOTTOMSHEET, props)))), /*#__PURE__*/React.createElement(Animated.View, _extends({
+  }, getTestProps('backdrop'), getAccessibilityProps(AccessibilityWidgetType.BOTTOMSHEET, props)))), /*#__PURE__*/React.createElement(Animated.View, {
     style: [styles.container, containerAnimatedStyle]
-  }, panHandlers), /*#__PURE__*/React.createElement(View, _extends({
+    // {...panHandlers}
+  }, /*#__PURE__*/React.createElement(View, _extends({
     style: styles.dragHandleContainer
   }, dragHandlePanHandlers), /*#__PURE__*/React.createElement(Pressable, {
     onPress: onDragHandlePress
   }, /*#__PURE__*/React.createElement(View, _extends({
     style: styles.dragIconHandle
-  }, getTestProps('draghandle'))))), children(contentStyle)));
+  }, getTestProps('draghandle'))))), /*#__PURE__*/React.createElement(GestureDetector, {
+    gesture: panGesture
+  }, children(contentStyle))));
 };
 export default class WmBottomsheet extends BaseComponent {
   // Helper method to calculate animation duration based on distance and velocity
@@ -146,6 +176,12 @@ export default class WmBottomsheet extends BaseComponent {
       this.closeSheet();
     }
   }
+  animate(props) {
+    this.updateState({
+      contentAnimationId: Date.now(),
+      contentAnimatableProps: props
+    });
+  }
   constructor(_props) {
     super(_props, DEFAULT_CLASS, new WmBottomsheetProps(), new WmBottomsheetState());
     _defineProperty(this, "calculatedHeight", void 0);
@@ -168,6 +204,9 @@ export default class WmBottomsheet extends BaseComponent {
     _defineProperty(this, "isIosKeyboardHeightSet", false);
     _defineProperty(this, "sheetModalService", void 0);
     _defineProperty(this, "isDragHandleExpanding", false);
+    //container widget scrollview ref and y offset value
+    _defineProperty(this, "containerscrollViewRef", null);
+    _defineProperty(this, "containerscrollYoffset", 0);
     // Reanimated shared values - created once and reused
     _defineProperty(this, "translateY", void 0);
     _defineProperty(this, "backdropOpacity", void 0);
@@ -322,6 +361,20 @@ export default class WmBottomsheet extends BaseComponent {
         if (this.state.isExpanded || this.props.disableswipedownclose) {
           if (gestureState.dy < this.expandedHeight / 4 || this.props.disableswipedownclose) {
             var _this$sheetHeight;
+            //reseting bottom sheet scrollview offset value to fix scrollview automatic scroll issue while collpsing the bottom sheet
+            setTimeout(() => {
+              var _this$state$scrollVie;
+              if ((_this$state$scrollVie = this.state.scrollViewRef) !== null && _this$state$scrollVie !== void 0 && _this$state$scrollVie.current) {
+                this.state.scrollViewRef.current.scrollTo({
+                  x: 0,
+                  y: 0,
+                  animated: false
+                });
+                this.updateState({
+                  scrollOffset: 0
+                });
+              }
+            }, this.animationDuration);
             let sheetMinimumHeight = this.props.bottomsheetminimumheight || 0.1;
             const targetHeight = this.props.disableswipedownclose ? sheetMinimumHeight * SCREEN_HEIGHT : this.calculatedHeight;
             const currentHeight = ((_this$sheetHeight = this.sheetHeight) === null || _this$sheetHeight === void 0 ? void 0 : _this$sheetHeight.value) || this.expandedHeight;
@@ -363,6 +416,47 @@ export default class WmBottomsheet extends BaseComponent {
         }
       }
     });
+    _defineProperty(this, "configurePanGesture", pan => {
+      pan.enabled(true).onUpdate(event => {
+        // ← Add : any
+        const gestureState = {
+          dy: event.translationY,
+          vy: event.velocityY,
+          moveX: event.x,
+          moveY: event.y,
+          vx: event.velocityX
+        };
+        if (gestureState.dy > 0 && this.translateY && this.lastGestureDyShared && this.state.scrollOffset <= 0 && this.containerscrollYoffset <= 0) {
+          const newTranslateY = Math.max(0, this.lastGestureDyShared.value + gestureState.dy);
+          this.translateY.value = newTranslateY;
+          // Reset expand flag if dragging down
+          this.isDragHandleExpanding = false;
+        } else if (gestureState.dy < 0 && this.props.expand && this.props.bottomsheetheightratio !== 1 && !this.isDragHandleExpanding && !this.state.isExpanded && this.props.disablescrollonrest) {
+          // Only trigger expand once with threshold of -50px upward drag
+          this.isDragHandleExpanding = true;
+          this.expandBottomSheet();
+        }
+        // ... rest of logic
+      }).onEnd(event => {
+        // ← Add : any
+        const gestureState = {
+          dy: event.translationY,
+          vy: event.velocityY,
+          moveX: event.x,
+          moveY: event.y,
+          vx: event.velocityX
+        };
+        if (gestureState.dy > 0 && this.state.scrollOffset <= 0 && this.containerscrollYoffset <= 0) {
+          this.handleSwipeGesture(gestureState);
+        }
+      }).onFinalize((event, success) => {
+        // ← Add types
+        if (!success) {
+          this.openSheet();
+        }
+      });
+      return pan;
+    });
     // panResponder for bottom sheet scroll view
     _defineProperty(this, "panResponder", PanResponder.create({
       onStartShouldSetPanResponder: (_, gestureState) => {
@@ -483,8 +577,12 @@ export default class WmBottomsheet extends BaseComponent {
         }
         this.updateState({
           isExpanded: false,
-          localModalsOpened: []
+          localModalsOpened: [],
+          scrollOffset: 0,
+          contentAnimationId: 0,
+          contentAnimatableProps: undefined
         });
+        this.containerscrollYoffset = 0;
         this.handleClose();
       };
       if (this.translateY && this.backdropOpacity) {
@@ -513,7 +611,9 @@ export default class WmBottomsheet extends BaseComponent {
         lastGestureDy: 0,
         isExpanded: false,
         isBottomsheetVisible: false,
-        localModalsOpened: []
+        localModalsOpened: [],
+        contentAnimationId: 0,
+        contentAnimatableProps: undefined
       });
       requestAnimationFrame(() => {
         if (this.sheetHeight) {
@@ -530,6 +630,14 @@ export default class WmBottomsheet extends BaseComponent {
     _defineProperty(this, "handleDragHandlePress", () => {
       this.invokeEventCallback('onDraghandleiconclick', [null, this]);
     });
+    _defineProperty(this, "renderAnimatedSheetChildren", children => {
+      if (!this.state.contentAnimatableProps) {
+        return children;
+      }
+      return /*#__PURE__*/React.createElement(Animatable.View, _extends({
+        key: this.state.contentAnimationId
+      }, this.state.contentAnimatableProps), children);
+    });
     _defineProperty(this, "renderContent", props => {
       // Don't render if shared values aren't initialized yet
       if (!this.translateY || !this.backdropOpacity || !this.sheetHeight || !this.lastGestureDyShared) {
@@ -550,8 +658,14 @@ export default class WmBottomsheet extends BaseComponent {
             this.topInset = topInset;
           });
         }
+        const absoluteStyle = {
+          top: 0,
+          left: 0,
+          right: 0
+        };
+        const rootStyle = props.modal ? [this.styles.root, absoluteStyle] : this.styles.root;
         return /*#__PURE__*/React.createElement(View, _extends({
-          style: this.styles.root
+          style: rootStyle
         }, this.getTestProps('keyboardview')), this._background, /*#__PURE__*/React.createElement(AnimatedBottomsheetContent, {
           translateY: this.translateY,
           backdropOpacity: this.backdropOpacity,
@@ -564,8 +678,21 @@ export default class WmBottomsheet extends BaseComponent {
           onBackdropPress: this.handleBackdropPress,
           onDragHandlePress: this.handleDragHandlePress,
           getTestProps: this.getTestProps.bind(this),
-          enabledragsettle: props.enabledragsettle
-        }, contentStyle => /*#__PURE__*/React.createElement(ScrollView, _extends({
+          enabledragsettle: props.enabledragsettle,
+          scrollRef: this.state.scrollViewRef,
+          containerScrollRef: this.containerscrollViewRef,
+          configurePanGesture: this.configurePanGesture
+        }, contentStyle => props.issticky ? props.enablemodalsupport ? /*#__PURE__*/React.createElement(ModalProvider, {
+          value: this.sheetModalService
+        }, /*#__PURE__*/React.createElement(Animated.View, {
+          style: [contentStyle, this.styles.sheetContentContainer, {
+            overflow: 'hidden'
+          }]
+        }, props.children)) : /*#__PURE__*/React.createElement(Animated.View, {
+          style: [contentStyle, this.styles.sheetContentContainer, {
+            overflow: 'hidden'
+          }]
+        }, props.children) : /*#__PURE__*/React.createElement(ScrollView, _extends({
           ref: this.state.scrollViewRef,
           style: this.styles.sheetContentContainer,
           contentContainerStyle: [this.styles.sheetScrollContent],
@@ -581,9 +708,9 @@ export default class WmBottomsheet extends BaseComponent {
           value: this.sheetModalService
         }, /*#__PURE__*/React.createElement(Animated.View, {
           style: contentStyle
-        }, props.children)) : /*#__PURE__*/React.createElement(Animated.View, {
+        }, this.renderAnimatedSheetChildren(props.children))) : /*#__PURE__*/React.createElement(Animated.View, {
           style: contentStyle
-        }, props.children))), Platform.OS === 'android' && !this.props.modal && bottomInset > 40 && /*#__PURE__*/React.createElement(SafeAreaView, {
+        }, this.renderAnimatedSheetChildren(props.children)))), Platform.OS === 'android' && !this.props.modal && bottomInset > 40 && /*#__PURE__*/React.createElement(SafeAreaView, {
           edges: ['bottom']
         }), props.enablemodalsupport && this.state.localModalsOpened && this.state.localModalsOpened.map((o, i) => /*#__PURE__*/React.createElement(View, {
           key: (o.name || '') + i,
@@ -601,7 +728,18 @@ export default class WmBottomsheet extends BaseComponent {
       });
     });
     this.calculatedHeight = this.calculateSheetHeight(_props.bottomsheetheightratio);
-
+    //container srollview ref
+    this.subscribe('containerScrollViewReady', ref => {
+      if (ref && ref.current && this.containerscrollViewRef !== ref) {
+        this.containerscrollViewRef = ref;
+        this.forceUpdate();
+      }
+    });
+    //container scrollview y offset value
+    this.subscribe('scroll', e => {
+      const offsetY = e.nativeEvent.contentOffset.y;
+      this.containerscrollYoffset = offsetY;
+    });
     // Use bottomsheetexpandedheightratio if provided, otherwise use expandedDefaultHeight
     const expandedRatio = _props.bottomsheetexpandedheightratio || this.expandedDefaultHeight;
     const effectiveExpandedRatio = Math.max(this.minimumExpandedHeight, Math.min(expandedRatio, this.maxHeight));
@@ -756,13 +894,17 @@ export default class WmBottomsheet extends BaseComponent {
             }
           },
           statusBarTranslucent: false
+        }, /*#__PURE__*/React.createElement(GestureHandlerRootView, {
+          style: {
+            flex: 1
+          }
         }, wrapWithSafeArea(/*#__PURE__*/React.createElement(KeyboardAvoidingView, {
           style: {
             flex: 1
           },
           behavior: 'padding',
           keyboardVerticalOffset: Platform.OS === 'ios' ? 0 : undefined
-        }, this.renderContent(props))));
+        }, this.renderContent(props)))));
       } else {
         return this.renderContent(props);
       }