Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,35 @@ render() {
//...
```

## :tada: Toolbar usage example

Sometimes you would want some custom touchable elements with your image component. This is the way you can use touchable elements. You can add custom styles, etc. To style image container use ```imageContainerStyle``` prop.

```javascript
import SmartGallery from "react-native-smart-gallery";

//...
render() {
return (
<SmartGallery
images={[
{ uri: "https://luehangs.site/pic-chat-app-images/beautiful-blond-blonde-hair-478544.jpg",
]}
toolbarItem={() => (
<View>
<TouchableOpacity
onPress={() => console.log('toolbar button pressed')}
>
<Text>Toolbar button</Text>
</TouchableOpacity>
</View>
)}
/>
);
}
//...
```

<br/>

---
Expand Down
35 changes: 31 additions & 4 deletions __tests__/ReactNativeSmartGallery-test.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,40 @@
import "react-native";
import { View, TouchableOpacity, Text } from "react-native";
import React from "react";
import {
data
} from "./mocks/dataMock";
import SmartGallery from "../src";
import SmartGallery from "../src/index";

// Note: test renderer must be required after react-native.
import renderer from "react-test-renderer";

it("React Native Smart Gallery renders correctly", () => {
renderer.create(<SmartGallery images={data} />);
describe("React Native Smart Gallery", () => {
it("should render correctly", () => {
renderer.create(<SmartGallery images={data} />);
});

it("should render toolbar correctly", () => {
const r = renderer.create(<SmartGallery
images={data}
toolbarItem={() => (
<View>
<TouchableOpacity
onPress={() => jest.fn()}
>
<Text>Toolbar button</Text>
</TouchableOpacity>
</View>
)}
/>);
expect(JSON.stringify(r.toJSON())).toMatch(new RegExp("Toolbar button"));
});

it("should consume image container styles", () => {
const r = renderer.create(<SmartGallery
images={data}
imageContainerStyle={{ backgroundColor: "#f1f2f3" }}
/>);
expect(r.toJSON())
.toHaveProperty("props.imageContainerStyle.backgroundColor", "#f1f2f3");
});
});
125 changes: 67 additions & 58 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export default class SmartGallery extends PureComponent {
renderItem: PropTypes.func,
errorComponent: PropTypes.func,
scrollViewProps: PropTypes.object,
toolbarItem: PropTypes.func,
imageContainerStyle: PropTypes.object,
};

static defaultProps = {
Expand All @@ -67,7 +69,11 @@ export default class SmartGallery extends PureComponent {
scrollViewProps: {},
onEndReachedThreshold: 0.5,
loadMinimal: true,
loadMinimalSize: 2
loadMinimalSize: 2,
toolbarItem: undefined,
imageContainerStyle: {
flex: 0.8
}
};

imageRefs = new Map();
Expand Down Expand Up @@ -302,65 +308,68 @@ export default class SmartGallery extends PureComponent {
onTransformGestureReleased, onSwipeUpReleased, onSwipeDownReleased, onDoubleTapStartReached,
onDoubleTapEndReached, resizeMode, enableResistance, enableScale, maxScale, enableTranslate,
resistantStrHorizontal, resistantStrVertical, maxOverScrollDistance, errorComponent,
renderItem, style
renderItem, style, toolbarItem, imageContainerStyle
} = this.props;
return (
<View style={style}>
<ImageTransformer
onViewTransformed={(transform) => {
onViewTransformed &&
onViewTransformed(transform, index);
}}
onPinchTransforming={(transform) => {
onPinchTransforming &&
onPinchTransforming(transform, index);
}}
onPinchStartReached={(transform) => {
onPinchStartReached &&
onPinchStartReached(transform, index);
}}
onPinchEndReached={(transform) => {
onPinchEndReached &&
onPinchEndReached(transform, index);
}}
onTransformGestureReleased={(transform) => {
// need the "return" here because the
// return value is checked in ViewTransformer
return onTransformGestureReleased &&
onTransformGestureReleased(transform, index);
}}
onSwipeUpReleased={(transform) => {
onSwipeUpReleased &&
onSwipeUpReleased(transform, index);
}}
onSwipeDownReleased={(transform) => {
onSwipeDownReleased &&
onSwipeDownReleased(transform, index);
}}
onDoubleTapStartReached={(transform) => {
onDoubleTapStartReached &&
onDoubleTapStartReached(transform, index);
}}
onDoubleTapEndReached={(transform) => {
onDoubleTapEndReached &&
onDoubleTapEndReached(transform, index);
}}
ref={(ref) => { this.imageRefs.set(index, ref); }}
key={`innerImage#${item.key || index}`}
errorComponent={errorComponent}
imageComponent={renderItem}
image={item}
index={index}
enableScale={enableScale}
maxScale={maxScale}
enableTranslate={enableTranslate}
enableResistance={enableResistance}
resistantStrHorizontal={resistantStrHorizontal}
resistantStrVertical={resistantStrVertical}
maxOverScrollDistance={maxOverScrollDistance}
resizeMode={resizeMode}
style={style}
/>
<View style={imageContainerStyle}>
<ImageTransformer
onViewTransformed={(transform) => {
onViewTransformed &&
onViewTransformed(transform, index);
}}
onPinchTransforming={(transform) => {
onPinchTransforming &&
onPinchTransforming(transform, index);
}}
onPinchStartReached={(transform) => {
onPinchStartReached &&
onPinchStartReached(transform, index);
}}
onPinchEndReached={(transform) => {
onPinchEndReached &&
onPinchEndReached(transform, index);
}}
onTransformGestureReleased={(transform) => {
// need the "return" here because the
// return value is checked in ViewTransformer
return onTransformGestureReleased &&
onTransformGestureReleased(transform, index);
}}
onSwipeUpReleased={(transform) => {
onSwipeUpReleased &&
onSwipeUpReleased(transform, index);
}}
onSwipeDownReleased={(transform) => {
onSwipeDownReleased &&
onSwipeDownReleased(transform, index);
}}
onDoubleTapStartReached={(transform) => {
onDoubleTapStartReached &&
onDoubleTapStartReached(transform, index);
}}
onDoubleTapEndReached={(transform) => {
onDoubleTapEndReached &&
onDoubleTapEndReached(transform, index);
}}
ref={(ref) => { this.imageRefs.set(index, ref); }}
key={`innerImage#${item.key || index}`}
errorComponent={errorComponent}
imageComponent={renderItem}
image={item}
index={index}
enableScale={enableScale}
maxScale={maxScale}
enableTranslate={enableTranslate}
enableResistance={enableResistance}
resistantStrHorizontal={resistantStrHorizontal}
resistantStrVertical={resistantStrVertical}
maxOverScrollDistance={maxOverScrollDistance}
resizeMode={resizeMode}
style={style}
/>
</View>
{toolbarItem ? toolbarItem(item, index) : null}
</View>
);
}
Expand Down Expand Up @@ -420,7 +429,7 @@ export default class SmartGallery extends PureComponent {
this._galleryViewPager = component;
}}
scrollViewStyle={this.props.scrollViewStyle}
scrollEnabled={false}
scrollEnabled={this.props.toolbarItem ? true : false}
renderItem={this.renderPage}
data={images}
{...gestureResponder}
Expand Down