@onekeyfe/react-native-native-overlay 3.0.162-alpha.272 → 6.7.0-12

package/src/web/useKeyboardShift.ts

@@ -99,7 +99,7 @@ export function useKeyboardShift({
         top = origin + sheet.offsetTop;
         bottom = top + sheet.offsetHeight;
       } else {
-        const extent = layoutExtent(contentRef.current);
+        const extent = layoutExtent(sheet ?? contentRef.current);
         if (extent) {
           top = origin + extent.top;
           bottom = origin + extent.bottom;

package/src/web/useSheetDrag.ts

@@ -129,15 +129,36 @@ export function useSheetDrag({
       );
     };
 
+    const onPointerCancel = (event: PointerEvent) => {
+      if (!tracking || event.pointerId !== pointerId) {
+        return;
+      }
+      tracking = false;
+      dragging = false;
+      velocity = 0;
+      if (sheet.hasPointerCapture?.(pointerId)) {
+        sheet.releasePointerCapture(pointerId);
+      }
+      pointerId = -1;
+      sheet.style.transform = '';
+      sheet.style.transition = '';
+      if (backdropRef.current) {
+        backdropRef.current.style.opacity = '1';
+      }
+    };
+
     sheet.addEventListener('pointerdown', onPointerDown);
     sheet.addEventListener('pointermove', onPointerMove);
     sheet.addEventListener('pointerup', onPointerUp);
-    sheet.addEventListener('pointercancel', onPointerUp);
+    sheet.addEventListener('pointercancel', onPointerCancel);
     return () => {
+      if (sheet.hasPointerCapture?.(pointerId)) {
+        sheet.releasePointerCapture(pointerId);
+      }
       sheet.removeEventListener('pointerdown', onPointerDown);
       sheet.removeEventListener('pointermove', onPointerMove);
       sheet.removeEventListener('pointerup', onPointerUp);
-      sheet.removeEventListener('pointercancel', onPointerUp);
+      sheet.removeEventListener('pointercancel', onPointerCancel);
     };
   }, [sheetRef, backdropRef, enabled]);
 }