From 5a2d746da226f4efc3d3fd8e6836a1bfb3b60ac6 Mon Sep 17 00:00:00 2001 From: Zachary Gibson Date: Thu, 10 Aug 2017 21:16:17 -0500 Subject: [PATCH 1/5] Include .ios extension in import --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index e6aaf19..4a92608 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,3 @@ -import Zoomable from './Zoomable'; +import Zoomable from "./Zoomable.ios"; export default Zoomable; From 213edcce07e32085e3a6542abf3e1e55689e7358 Mon Sep 17 00:00:00 2001 From: Zachary Gibson Date: Wed, 16 Aug 2017 12:48:38 -0500 Subject: [PATCH 2/5] =?UTF-8?q?Prefer=20single=20quotes=20=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 4a92608..94d7720 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,3 @@ -import Zoomable from "./Zoomable.ios"; +import Zoomable from './Zoomable.ios'; export default Zoomable; From 0da7bd40907e60f4c774702eb83a6e73a06110bb Mon Sep 17 00:00:00 2001 From: Zach Gibson Date: Tue, 3 Oct 2017 17:57:31 -0500 Subject: [PATCH 3/5] Add style and contentContainerStyle props --- Zoomable.ios.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Zoomable.ios.js b/Zoomable.ios.js index 1528948..c511c25 100644 --- a/Zoomable.ios.js +++ b/Zoomable.ios.js @@ -107,6 +107,8 @@ class Zoomable extends React.Component { showsVerticalScrollIndicator={false} maximumZoomScale={this.props.zoomScale} centerContent + style={this.props.style} + contentContainerStyle={this.props.contentContainerStyle} > {this.props.children} @@ -120,6 +122,8 @@ Zoomable.propTypes = { zoomScale: PropTypes.number, zoomInTrigger: PropTypes.oneOf(['singletap', 'doubletap', 'longpress']), zoomOutTrigger: PropTypes.oneOf(['singletap', 'doubletap', 'longpress']), + style: PropTypes.shape({}), + contentContainerStyle: PropTypes.shape({}), }; Zoomable.defaultProps = { @@ -127,6 +131,8 @@ Zoomable.defaultProps = { zoomScale: 4, zoomInTrigger: 'doubletap', zoomOutTrigger: 'singletap', + style: {}, + contentContainerStyle: {}, }; export default Zoomable; From e79a3a91ad83ee9b94f6726a522582327454e6ce Mon Sep 17 00:00:00 2001 From: Zach Gibson Date: Tue, 3 Oct 2017 18:00:03 -0500 Subject: [PATCH 4/5] =?UTF-8?q?Revert=20"Prefer=20single=20quotes=20?= =?UTF-8?q?=F0=9F=98=85"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 213edcce07e32085e3a6542abf3e1e55689e7358. --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 94d7720..4a92608 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,3 @@ -import Zoomable from './Zoomable.ios'; +import Zoomable from "./Zoomable.ios"; export default Zoomable; From 9b02e4f8b49fea1d0e40b90322e1863fbe5b20ba Mon Sep 17 00:00:00 2001 From: Zach Gibson Date: Tue, 3 Oct 2017 18:00:11 -0500 Subject: [PATCH 5/5] Revert "Include .ios extension in import" This reverts commit 5a2d746da226f4efc3d3fd8e6836a1bfb3b60ac6. --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 4a92608..e6aaf19 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,3 @@ -import Zoomable from "./Zoomable.ios"; +import Zoomable from './Zoomable'; export default Zoomable;