react-native-pdf 6.6.1 → 6.6.2

package/PinchZoomView.js

@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2017-present, Wonday (@wonday.org)
+ * All rights reserved.
+ *
+ * This source code is licensed under the MIT-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
+import {
+    View,
+    StyleSheet,
+    PanResponder
+} from 'react-native';
+import {ViewPropTypes} from 'deprecated-react-native-prop-types';
+export default class PinchZoomView extends Component {
+
+    static propTypes = {
+        ...ViewPropTypes,
+        scalable: PropTypes.bool,
+        onScaleChanged: PropTypes.func,
+    };
+
+    static defaultProps = {
+        scalable: true,
+        onScaleChanged: (scale) => {
+        },
+    };
+
+    constructor(props) {
+
+        super(props);
+        this.state = {};
+        this.distant = 0;
+        this.gestureHandlers = PanResponder.create({
+            onStartShouldSetPanResponder: this._handleStartShouldSetPanResponder,
+            onMoveShouldSetResponderCapture: (evt, gestureState) => (true),
+            onMoveShouldSetPanResponder: this._handleMoveShouldSetPanResponder,
+            onPanResponderGrant: this._handlePanResponderGrant,
+            onPanResponderMove: this._handlePanResponderMove,
+            onPanResponderRelease: this._handlePanResponderEnd,
+            onPanResponderTerminationRequest: evt => false,
+            onPanResponderTerminate: this._handlePanResponderTerminate,
+            onShouldBlockNativeResponder: evt => true
+        });
+
+    }
+
+    _handleStartShouldSetPanResponder = (e, gestureState) => {
+
+        // don't respond to single touch to avoid shielding click on child components
+        return false;
+
+    };
+
+    _handleMoveShouldSetPanResponder = (e, gestureState) => {
+
+        return this.props.scalable && (e.nativeEvent.changedTouches.length >= 2 || gestureState.numberActiveTouches >= 2);
+
+    };
+
+    _handlePanResponderGrant = (e, gestureState) => {
+
+        if (e.nativeEvent.changedTouches.length >= 2 || gestureState.numberActiveTouches >= 2) {
+            let dx = Math.abs(e.nativeEvent.touches[0].pageX - e.nativeEvent.touches[1].pageX);
+            let dy = Math.abs(e.nativeEvent.touches[0].pageY - e.nativeEvent.touches[1].pageY);
+            this.distant = Math.sqrt(dx * dx + dy * dy);
+        }
+
+    };
+
+    _handlePanResponderEnd = (e, gestureState) => {
+
+        this.distant = 0;
+
+    };
+
+    _handlePanResponderTerminate = (e, gestureState) => {
+
+        this.distant = 0;
+
+    };
+
+    _handlePanResponderMove = (e, gestureState) => {
+
+        if ((e.nativeEvent.changedTouches.length >= 2 || gestureState.numberActiveTouches >= 2) && this.distant > 100) {
+
+            let dx = Math.abs(e.nativeEvent.touches[0].pageX - e.nativeEvent.touches[1].pageX);
+            let dy = Math.abs(e.nativeEvent.touches[0].pageY - e.nativeEvent.touches[1].pageY);
+            let distant = Math.sqrt(dx * dx + dy * dy);
+            let scale = (distant / this.distant);
+            let pageX = (e.nativeEvent.touches[0].pageX + e.nativeEvent.touches[1].pageX) / 2;
+            let pageY = (e.nativeEvent.touches[0].pageY + e.nativeEvent.touches[1].pageY) / 2;
+            let pinchInfo = {scale: scale, pageX: pageX, pageY: pageY};
+
+            this.props.onScaleChanged(pinchInfo);
+            this.distant = distant;
+
+        }
+
+    };
+
+    render() {
+
+        return (
+            <View
+                {...this.props}
+                {...this.gestureHandlers?.panHandlers}
+                style={[styles.container, this.props.style]}>
+                {this.props.children}
+            </View>
+        );
+
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center'
+    }
+});

package/README.md

@@ -169,18 +169,25 @@ react-native run-ios
 <details>
   <summary>ChangeLog details</summary>
 
-v6.6.0
+v6.6.2
+1. Fixed: Migrate to ViewPropTypes exported from 'deprecated-react-native-prop-types'
+2. Added: Decode File Path for iOS
+3. Improved: prefer current page for calculating scale factor on fit
+
+v6.6.1 depresed
+
+v6.6.0 depresed
 1. Fixed: Migrate to ViewPropTypes exported from 'deprecated-react-native-prop-types'
 2. Added: Decode File Path for iOS
 3. Improved: prefer current page for calculating scale factor on fit
 4. Improved: Typescript version source
 
 v6.5.0
-1. Fixed: replace mavenCentral with maven
+1. Fix: replace mavenCentral with maven
 2. Breaking Change(Android): replace deprecated repository: jcenter()
-3. Fixed: loading progress
-4. Added: Typed "source" prop
-5. Removed: dependency to fbjs
+3. Fix: loading progress
+4. Add: Typed "source" prop
+5. Remove: dependency to fbjs
 
 v6.4.0
 1. Remove sample for reducing NPM package size

package/index.d.ts

@@ -25,10 +25,10 @@ export type Source = {
     cacheFileName?: string;
     expiration?: number;
     method?: string;
-    body?: any
 };
 
-export interface PdfProps extends ReactNative.ViewProps {
+interface Props {
+    style?: ReactNative.StyleProp<ReactNative.ViewStyle>,
     source: Source | number,
     page?: number,
     scale?: number,
@@ -37,83 +37,25 @@ export interface PdfProps extends ReactNative.ViewProps {
     horizontal?: boolean,
     spacing?: number,
     password?: string,
-    renderActivityIndicator: (progress: number) => React.ReactElement,
+    renderActivityIndicator?: (progress: number) => React.ReactElement,
     enableAntialiasing?: boolean,
-    enableAnnotationRendering?: boolean,
     enablePaging?: boolean,
     enableRTL?: boolean,
+    enableAnnotationRendering?: boolean,
     fitPolicy?: number,
     trustAllCerts?: boolean,
     singlePage?: boolean,
-    onLoadProgress?: (percent: number) => void,
+    onLoadProgress?: (percent: number,) => void,
     onLoadComplete?: (numberOfPages: number, path: string, size: {height: number, width: number}, tableContents?: TableContent[]) => void,
     onPageChanged?: (page: number, numberOfPages: number) => void,
-    onError?: (error: any) => void,
+    onError?: (error: object) => void,
     onPageSingleTap?: (page: number, x: number, y: number) => void,
     onScaleChanged?: (scale: number) => void,
     onPressLink?: (url: string) => void,
-    setPage: (pageNumber: number) => void;
-
-    usePDFKit?: boolean
-}
-
-export type PdfState = {
-    path: string
-    isDownloaded: boolean
-    progress: number
-    isSupportPDFKit: number
-}
-
-export interface PdfViewProps extends ReactNative.ViewProps {
-    path: string
-    password?: string
-    scale: number
-    minScale: number
-    maxScale: number
-    spacing: number
-    fitPolicy?: number
-    horizontal?: boolean
-    page: number
-    currentPage: number
-    singlePage: boolean
-    enablePaging: boolean
-    onPageSingleTap: PdfProps['onPageSingleTap']
-    onScaleChanged: PdfProps['onScaleChanged']
-    onLoadComplete: PdfProps['onLoadComplete']
-    onError: PdfProps['onError']
-    onPageChanged: PdfProps['onPageChanged']
-}
-
-export type PdfViewState = {
-    pdfLoaded: boolean
-    fileNo: number
-    numberOfPages:number
-    page: number
-    currentPage: number
-    pageAspectRate: number
-    pdfPageSize: {width: number, height: number}
-    contentContainerSize: {width: number, height: number}
-    scale: number
-    contentOffset: {x: number, y: number}
-    newContentOffset: {x: number, y: number}
-    centerContent: boolean
 }
 
-export interface PdfPageViewProps extends ReactNative.ViewProps {
-    fileNo: number
-    page: number
-    width: number
-    height: number
-}
-
-export interface PinchZoomViewProps extends ReactNative.ViewProps {
-    scalable: boolean
-    onScaleChanged: (scaled: {pageX: number; pageY: number; scale: number}) => void
+declare class Pdf extends React.Component<Props, any> {
+    setPage: (pageNumber: number) => void;
 }
 
-export interface DoubleTapViewProps extends ReactNative.ViewProps {
-    delay: number
-    radius: number
-    onSingleTap: PropTypes.func,
-    onDoubleTap: PropTypes.func,
-}
+export default Pdf;