diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f95cb795..e5c49fb59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,70 @@
+# [6.0.0](https://github.com/perrystreetsoftware/react-native-fast-image/compare/v5.0.11...v6.0.0) (2021-08-03)
+
+
+### Bug Fixes
+
+* add react@17 as peer dependency ([#790](https://github.com/perrystreetsoftware/react-native-fast-image/issues/790)) ([27bd586](https://github.com/perrystreetsoftware/react-native-fast-image/commit/27bd58630cff4e10fea0bb835555bb7ad8b62da0))
+* xcode 12 compatibility ([#732](https://github.com/perrystreetsoftware/react-native-fast-image/issues/732)) ([23c3955](https://github.com/perrystreetsoftware/react-native-fast-image/commit/23c3955473a94477c52c0ec2b9f4f51e9377be06))
+* **android:** make center ResizeMode work correctly ([d648ef8](https://github.com/perrystreetsoftware/react-native-fast-image/commit/d648ef85045fb97d8d1f6a637e915fa912a6c6c9))
+* **android:** remove explicit use of UI thread ([#698](https://github.com/perrystreetsoftware/react-native-fast-image/issues/698)) ([5d2894e](https://github.com/perrystreetsoftware/react-native-fast-image/commit/5d2894e442dc3d239b4dc9cb25dca455f7d8bc6e))
+* accessibilityIgnoresInvertColors prop not recognised when using TypeScript ([#666](https://github.com/perrystreetsoftware/react-native-fast-image/issues/666)) ([22f89e4](https://github.com/perrystreetsoftware/react-native-fast-image/commit/22f89e43a422150412924da9fd0f3eca7dd77cfa)), closes [/github.com/DylanVann/react-native-fast-image/blob/master/src/index.tsx#L150-L160](https://github.com//github.com/DylanVann/react-native-fast-image/blob/master/src/index.tsx/issues/L150-L160)
+* Add git tag to CocoaPods source property ([#601](https://github.com/perrystreetsoftware/react-native-fast-image/issues/601)) ([2d706ad](https://github.com/perrystreetsoftware/react-native-fast-image/commit/2d706ad7da6410a3a2382b70ed90369f0473117e))
+* Add tintColor type definition. ([4adf42f](https://github.com/perrystreetsoftware/react-native-fast-image/commit/4adf42f935372c9434851a122ed8fdb8ec0ecaf8))
+* Bump Glide version number to v4.11.0. ([#649](https://github.com/perrystreetsoftware/react-native-fast-image/issues/649)) ([c4e4306](https://github.com/perrystreetsoftware/react-native-fast-image/commit/c4e4306c15bda65d95e97ab9f45ef5e351128253)), closes [#536](https://github.com/perrystreetsoftware/react-native-fast-image/issues/536)
+* Fix dependency versions not specified in podfile. ([89f3379](https://github.com/perrystreetsoftware/react-native-fast-image/commit/89f337998e48b84a3f627dcdb057a8ac355c4ea2)), closes [#456](https://github.com/perrystreetsoftware/react-native-fast-image/issues/456)
+* Fix fallback prop not working. ([#420](https://github.com/perrystreetsoftware/react-native-fast-image/issues/420)) ([487d410](https://github.com/perrystreetsoftware/react-native-fast-image/commit/487d41040db938f3ee12bc00e09fe42ebb0be5e5))
+* Fix IllegalArgumentException crash (Android). ([#511](https://github.com/perrystreetsoftware/react-native-fast-image/issues/511)) ([b6c4677](https://github.com/perrystreetsoftware/react-native-fast-image/commit/b6c467780b72e6b2440b6296f3bc520102734dae))
+* Fix incorrect syntax. ([11f6047](https://github.com/perrystreetsoftware/react-native-fast-image/commit/11f6047658334ba3c73e089413acb47c7a0493f4))
+* Fix local resource cache issue on Android. ([#472](https://github.com/perrystreetsoftware/react-native-fast-image/issues/472)) ([5f65383](https://github.com/perrystreetsoftware/react-native-fast-image/commit/5f653838b853f115777b1a2394238e5b3698feda)), closes [#402](https://github.com/perrystreetsoftware/react-native-fast-image/issues/402)
+* Fix memory leak on iOS. ([#433](https://github.com/perrystreetsoftware/react-native-fast-image/issues/433)) ([70be744](https://github.com/perrystreetsoftware/react-native-fast-image/commit/70be74432d39f8e5289192b5bb116ab47e207615))
+* Fix peer dependency and remove prop-types. ([44a4c8b](https://github.com/perrystreetsoftware/react-native-fast-image/commit/44a4c8b3409ea206a8ede0e8e9e0ec0f32c9b5b1))
+* Fix setting props order issue for iOS. ([#303](https://github.com/perrystreetsoftware/react-native-fast-image/issues/303)) ([5597ed0](https://github.com/perrystreetsoftware/react-native-fast-image/commit/5597ed0dad451530d4e5c42b61bfb5aba4b1566a)), closes [#304](https://github.com/perrystreetsoftware/react-native-fast-image/issues/304)
+* Fix wildcard peer dependencies. ([7149420](https://github.com/perrystreetsoftware/react-native-fast-image/commit/71494208b85eef6fcbe8d61095c240c0b1f27458)), closes [#440](https://github.com/perrystreetsoftware/react-native-fast-image/issues/440)
+* Fixes cacheControl types. ([#382](https://github.com/perrystreetsoftware/react-native-fast-image/issues/382)) ([e13db7d](https://github.com/perrystreetsoftware/react-native-fast-image/commit/e13db7d40974a5a04eab8598292e02b5d7f5bf5a)), closes [#325](https://github.com/perrystreetsoftware/react-native-fast-image/issues/325)
+* Fixes podspec syntax. ([b627646](https://github.com/perrystreetsoftware/react-native-fast-image/commit/b627646001e334ece89c49e0aa6bc403f496f8ce))
+* Fixes WebP rendering on iOS 12. ([#412](https://github.com/perrystreetsoftware/react-native-fast-image/issues/412)) ([97630c8](https://github.com/perrystreetsoftware/react-native-fast-image/commit/97630c8ee4bd5f1b81911f6f8a6285c089d5cf94)), closes [#298](https://github.com/perrystreetsoftware/react-native-fast-image/issues/298) [#385](https://github.com/perrystreetsoftware/react-native-fast-image/issues/385)
+* Loading images by reverting "bug: Use device scale when loading images.". ([0326c3e](https://github.com/perrystreetsoftware/react-native-fast-image/commit/0326c3ebbbff21c0e38ffa6112b27d2ab042729f)), closes [#509](https://github.com/perrystreetsoftware/react-native-fast-image/issues/509)
+* peer dependency warning ([#653](https://github.com/perrystreetsoftware/react-native-fast-image/issues/653)) ([cd81b1b](https://github.com/perrystreetsoftware/react-native-fast-image/commit/cd81b1b66a8d9938764a66e1f3c1bd5ff20b3565))
+* remove cache property if using fallback ([ba0f238](https://github.com/perrystreetsoftware/react-native-fast-image/commit/ba0f238821ba23517b8e62e759f685b8cd67c0c6))
+* Replace 'Component' with 'ComponentType' ([#647](https://github.com/perrystreetsoftware/react-native-fast-image/issues/647)) ([6abb273](https://github.com/perrystreetsoftware/react-native-fast-image/commit/6abb273ce590ab7a111695a601b603823ac0bf4e))
+* update SDWebImage and SDWebImageWebPCoder ([#689](https://github.com/perrystreetsoftware/react-native-fast-image/issues/689)) ([9646456](https://github.com/perrystreetsoftware/react-native-fast-image/commit/964645667525dc09f625bc471548b995e01d0061))
+* Updates SDWebImageWebPCoder. ([#628](https://github.com/perrystreetsoftware/react-native-fast-image/issues/628)) ([325d77f](https://github.com/perrystreetsoftware/react-native-fast-image/commit/325d77f4c2e2e1437c0dda160b6047473d7c8a07))
+* Upgrade vendored SDWebImage to v5.0.5. ([5016172](https://github.com/perrystreetsoftware/react-native-fast-image/commit/5016172cfcbbf7a1a835c06eb280177ee857bf18)), closes [#489](https://github.com/perrystreetsoftware/react-native-fast-image/issues/489)
+* wrong cache type ([#688](https://github.com/perrystreetsoftware/react-native-fast-image/issues/688)) [skip ci] ([94e2256](https://github.com/perrystreetsoftware/react-native-fast-image/commit/94e2256da234d535e88172ce325c89e7cb69fc6e))
+
+
+### Features
+
+* **ios:** allow for for per-image-request-headers ([#691](https://github.com/perrystreetsoftware/react-native-fast-image/issues/691)) ([4a7cd64](https://github.com/perrystreetsoftware/react-native-fast-image/commit/4a7cd64f5b0aa40b04d63ccb105ee2b511abe624))
+* Add cookie support for iOS. ([#284](https://github.com/perrystreetsoftware/react-native-fast-image/issues/284)) ([ae47bff](https://github.com/perrystreetsoftware/react-native-fast-image/commit/ae47bff4de7e532dd817febf3da5a370303538b8))
+* Add tint color support. ([03c50f0](https://github.com/perrystreetsoftware/react-native-fast-image/commit/03c50f026c31aca9952e1b1fcac712e66ebce2b9)), closes [#124](https://github.com/perrystreetsoftware/react-native-fast-image/issues/124)
+* Add tvOS target. ([#486](https://github.com/perrystreetsoftware/react-native-fast-image/issues/486)) ([6805972](https://github.com/perrystreetsoftware/react-native-fast-image/commit/6805972159d56d3ee398a88b7a279b61ee6a624c))
+* converts to TypeScript ([#642](https://github.com/perrystreetsoftware/react-native-fast-image/issues/642)) ([ac11706](https://github.com/perrystreetsoftware/react-native-fast-image/commit/ac117060ebdd04b2130bfb23c62f203beb077089))
+* export ResizeMode and Priority types ([#678](https://github.com/perrystreetsoftware/react-native-fast-image/issues/678)) ([e33664f](https://github.com/perrystreetsoftware/react-native-fast-image/commit/e33664fbcff4be7b180c3843422f76e9d0b1c4f8))
+* Upgrade example apps. ([#453](https://github.com/perrystreetsoftware/react-native-fast-image/issues/453)) ([25f8f0d](https://github.com/perrystreetsoftware/react-native-fast-image/commit/25f8f0d85acb0e4b4a8cde9eacd9184470a49473))
+* Upgrade to React Native 0.60.0 / CocoaPods / Android X. ([#513](https://github.com/perrystreetsoftware/react-native-fast-image/issues/513)) ([5489f9e](https://github.com/perrystreetsoftware/react-native-fast-image/commit/5489f9ec4bbc80c657ac351130771637d1f61672))
+* Upgrade to SDWebImage 5.0. ([#454](https://github.com/perrystreetsoftware/react-native-fast-image/issues/454)) ([8a216e2](https://github.com/perrystreetsoftware/react-native-fast-image/commit/8a216e2079b5333748ad26c3b8055ce3c57cd979)), closes [#447](https://github.com/perrystreetsoftware/react-native-fast-image/issues/447)
+* Use forwardRef to allow access to ref.measure and others. ([#419](https://github.com/perrystreetsoftware/react-native-fast-image/issues/419)) ([2b4fba3](https://github.com/perrystreetsoftware/react-native-fast-image/commit/2b4fba3ad8e8d523c838c8158181b5d4f3ae5ddb)), closes [#69](https://github.com/perrystreetsoftware/react-native-fast-image/issues/69)
+
+
+### Performance Improvements
+
+* Use React.memo for FastImage. ([#449](https://github.com/perrystreetsoftware/react-native-fast-image/issues/449)) ([5c2b4af](https://github.com/perrystreetsoftware/react-native-fast-image/commit/5c2b4afa41cb73815b830cee9668747ff05e2d3e))
+
+
+### Reverts
+
+* Remove functionality for notifying other images on load. ([#452](https://github.com/perrystreetsoftware/react-native-fast-image/issues/452)) ([292223d](https://github.com/perrystreetsoftware/react-native-fast-image/commit/292223d0ff07e70ffa94981cb83ae8fff2298d33))
+
+
+### BREAKING CHANGES
+
+* This changes how network requests are handled on iOS. Make sure they still work for you.
+* You should upgrade React Native. See https://facebook.github.io/react-native/blog/2019/07/03/version-60
+* Upgrade SDWebImage, may affect some projects and CocoaPods users.
+
+Fix the bug of `cacheOnly` behavior
+
## [8.3.7](https://github.com/DylanVann/react-native-fast-image/compare/v8.3.6...v8.3.7) (2021-07-24)
## [8.3.6](https://github.com/DylanVann/react-native-fast-image/compare/v8.3.5...v8.3.6) (2021-07-08)
diff --git a/README.md b/README.md
index e8a221304..f6a29a2ff 100644
--- a/README.md
+++ b/README.md
@@ -259,3 +259,6 @@ Thanks to [@mobinni](https://github.com/mobinni) for helping with the conceptual
[github-watch]: https://github.com/dylanvann/react-native-fast-image/watchers
[github-star-badge]: https://img.shields.io/github/stars/dylanvann/react-native-fast-image.svg?style=social
[github-star]: https://github.com/dylanvann/react-native-fast-image/stargazers
+
+
+Twiddle
\ No newline at end of file
diff --git a/RNFastImage.podspec b/RNFastImage.podspec
index 93edc7060..ce3c9605f 100644
--- a/RNFastImage.podspec
+++ b/RNFastImage.podspec
@@ -14,6 +14,8 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.source = { :git => "https://github.com/DylanVann/react-native-fast-image.git", :tag => "v#{s.version}" }
s.source_files = "ios/**/*.{h,m}"
+ s.ios.frameworks = "ScreenShieldKit"
+ s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/../../' }
s.dependency 'React-Core'
s.dependency 'SDWebImage', '~> 5.8'
diff --git a/ios/FastImage/FFFastImageView.h b/ios/FastImage/FFFastImageView.h
index fb557cf39..213f617bf 100644
--- a/ios/FastImage/FFFastImageView.h
+++ b/ios/FastImage/FFFastImageView.h
@@ -18,6 +18,7 @@
@property (nonatomic, assign) RCTResizeMode resizeMode;
@property (nonatomic, strong) FFFastImageSource *source;
@property (nonatomic, strong) UIColor *imageColor;
+@property (nonatomic) BOOL screenshotProtected;
@end
diff --git a/ios/FastImage/FFFastImageView.m b/ios/FastImage/FFFastImageView.m
index c5f79b431..6c02bef8e 100644
--- a/ios/FastImage/FFFastImageView.m
+++ b/ios/FastImage/FFFastImageView.m
@@ -1,8 +1,11 @@
#import "FFFastImageView.h"
#import <SDWebImage/UIImage+MultiFormat.h>
+@import ScreenShieldKit;
+
@interface FFFastImageView()
+@property (nonatomic, strong) SSKProtectedImageView *protectedImageView;
@property (nonatomic, assign) BOOL hasSentOnLoadStart;
@property (nonatomic, assign) BOOL hasCompleted;
@property (nonatomic, assign) BOOL hasErrored;
@@ -19,6 +22,12 @@ - (id) init {
self = [super init];
self.resizeMode = RCTResizeModeCover;
self.clipsToBounds = YES;
+
+ self.protectedImageView = [[SSKProtectedImageView alloc] initWithImage:nil];
+ [self addSubview:self.protectedImageView];
+ self.protectedImageView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+ self.protectedImageView.hidden = YES;
+
return self;
}
@@ -84,6 +93,15 @@ - (void)setImage:(UIImage *)image {
} else {
super.image = image;
}
+
+ if (self.screenshotProtected) {
+ self.protectedImageView.image = super.image;
+ self.protectedImageView.hidden = NO;
+ super.image = nil;
+ } else {
+ self.protectedImageView.image = nil;
+ self.protectedImageView.hidden = YES;
+ }
}
- (void)sendOnLoad:(UIImage *)image {
@@ -136,13 +154,13 @@ - (void)reloadImage
}
self.hasCompleted = YES;
[self sendOnLoad:image];
-
+
if (self.onFastImageLoadEnd) {
self.onFastImageLoadEnd(@{});
}
return;
}
-
+
// Set headers.
NSDictionary *headers = _source.headers;
SDWebImageDownloaderRequestModifier *requestModifier = [SDWebImageDownloaderRequestModifier requestModifierWithBlock:^NSURLRequest * _Nullable(NSURLRequest * _Nonnull request) {
@@ -154,7 +172,7 @@ - (void)reloadImage
return [mutableRequest copy];
}];
SDWebImageContext *context = @{SDWebImageContextDownloadRequestModifier : requestModifier};
-
+
// Set priority.
SDWebImageOptions options = SDWebImageRetryFailed | SDWebImageHandleCookies;
switch (_source.priority) {
@@ -168,7 +186,7 @@ - (void)reloadImage
options |= SDWebImageHighPriority;
break;
}
-
+
switch (_source.cacheControl) {
case FFFCacheControlWeb:
options |= SDWebImageRefreshCached;
@@ -179,7 +197,7 @@ - (void)reloadImage
case FFFCacheControlImmutable:
break;
}
-
+
if (self.onFastImageLoadStart) {
self.onFastImageLoadStart(@{});
self.hasSentOnLoadStart = YES;
@@ -188,7 +206,7 @@ - (void)reloadImage
}
self.hasCompleted = NO;
self.hasErrored = NO;
-
+
[self downloadImage:_source options:options context:context];
}
}
diff --git a/package.json b/package.json
index 71a23a0d7..17b5f063f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "react-native-fast-image",
- "version": "8.3.7",
+ "version": "6.0.0",
"description": "🚩 FastImage, performant React Native image component.",
"keywords": [
"cache",
@@ -15,7 +15,7 @@
},
"repository": {
"type": "git",
- "url": "https://github.com/DylanVann/react-native-fast-image.git"
+ "url": "https://github.com/perrystreetsoftware/react-native-fast-image.git"
},
"license": "(MIT AND Apache-2.0)",
"author": "Dylan Vann <dylan@dylanvann.com> (https://dylanvann.com)",
@@ -28,13 +28,16 @@
"ios",
"!ios/build",
"dist",
- "RNFastImage.podspec"
+ "RNFastImage.podspec",
+ "tsconfig.json",
+ "babel.config.js",
+ "src"
],
"scripts": {
- "build": "dv-scripts build && cp src/index.js.flow dist/index.js.flow",
- "lint": "dv-scripts lint",
- "release": "dv-scripts release",
- "test": "dv-scripts test"
+ "build": "npx dv-scripts build && cp src/index.js.flow dist/index.js.flow",
+ "lint": "npx dv-scripts lint",
+ "release": "npx dv-scripts release",
+ "test": "npx dv-scripts test"
},
"prettier": {
"semi": false,
@@ -62,7 +65,7 @@
"@types/react": "^17.0.14",
"@types/react-native": "^0.64.12",
"@types/react-test-renderer": "^17.0.1",
- "dv-scripts": "^1.4.2",
+ "dv-scripts": "^1.5.0",
"eslint-config-dv-scripts": "^1.1.1",
"metro-react-native-babel-preset": "^0.66.1",
"prettier": "^2.3.2",
diff --git a/src/index.tsx b/src/index.tsx
index 4734a784c..515335aac 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -82,6 +82,7 @@ export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS {
export interface FastImageProps extends AccessibilityProps {
source: Source | number
resizeMode?: ResizeMode
+ screenshotProtected?: boolean
fallback?: boolean
onLoadStart?(): void
@@ -141,6 +142,7 @@ function FastImageBase({
children,
// eslint-disable-next-line no-shadow
resizeMode = 'cover',
+ screenshotProtected,
forwardedRef,
...props
}: FastImageProps & { forwardedRef: React.Ref<any> }) {
@@ -182,6 +184,7 @@ function FastImageBase({
onFastImageError={onError}
onFastImageLoadEnd={onLoadEnd}
resizeMode={resizeMode}
+ screenshotProtected={screenshotProtected}
/>
{children}
</View>
diff --git a/yarn.lock b/yarn.lock
index 8b0f7701e..58c9e662a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3970,7 +3970,7 @@ duplexer2@~0.1.0:
dependencies:
readable-stream "^2.0.2"
-dv-scripts@^1.4.2:
+dv-scripts@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/dv-scripts/-/dv-scripts-1.5.0.tgz#d4ad318173f39f9d126fe0d5c3573996c546f738"
integrity sha512-f6UY3gLZRLwDKNGn8xSqMdH371HMAABoh+AeaIgtr5NRMglJ+1ptumXMfYgS09OfLRGv96x7Q4WvwcYyjqkQ6Q==
@@ -7312,7 +7312,6 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.3.tgz#34c7cea038c817a8658461bf35174551dce17a0a"
integrity sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==
dependencies:
- encoding "^0.1.12"
minipass "^3.1.0"
minipass-sized "^1.0.3"
minizlib "^2.0.0"