@supportworks/multi-imagepicker 7.0.3 → 7.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@supportworks/multi-imagepicker",
3
- "version": "7.0.3",
3
+ "version": "7.0.5",
4
4
  "description": "Android and iOS customized multiple image picker. For react-native >= 0.60.",
5
5
  "main": "index.js",
6
6
  "author": {
@@ -454,10 +454,12 @@ const AddImages = forwardRef((
454
454
  </View>
455
455
  </SafeAreaView>
456
456
 
457
- <UploadWarningModal
458
- visible={showInfoDialog}
459
- onClose={onCloseInfoDialog}
460
- />
457
+ {Api.getApi().sendPhotosToCRM() && (
458
+ <UploadWarningModal
459
+ visible={showInfoDialog}
460
+ onClose={onCloseInfoDialog}
461
+ />
462
+ )}
461
463
  </Modal>
462
464
  )
463
465
  }
@@ -57,11 +57,7 @@ const ImageDetailsModal = (
57
57
  </TouchableOpacity>
58
58
  }
59
59
  />
60
- <KeyboardAvoidingView style={styles.KeyboardAvoidingView} behavior={Platform.OS === 'ios' ? 'padding' : 'position'} enabled>
61
- {/*<ScrollView
62
- keyboardShouldPersistTaps="handled"
63
- contentContainerStyle={styles.ScrollContent}
64
- >*/}
60
+ <KeyboardAvoidingView style={styles.KeyboardAvoidingView} behavior={Platform.OS === 'ios' ? 'padding' : 'height'} enabled>
65
61
  <View style={styles.ImageContainer}>
66
62
  <Image
67
63
  source={{ uri: imageUri }}
@@ -98,7 +94,6 @@ const ImageDetailsModal = (
98
94
  callback={(payload) => setLocalDesc(payload.inputValue)}
99
95
  />
100
96
  </View>
101
- {/*</ScrollView>*/}
102
97
  </KeyboardAvoidingView>
103
98
  </SafeAreaView>
104
99
  </Modal>
@@ -11,12 +11,10 @@ import { BlurView } from '@react-native-community/blur'
11
11
  const ImageIndicators = (
12
12
  {
13
13
  saveToDevice = false,
14
- allowSaveToDevice = null,
15
- allowShowToCustomer = null,
16
14
  showToCust = false
17
15
  }) => {
18
16
  return (
19
- ((allowShowToCustomer && showToCust) || (allowSaveToDevice && saveToDevice)) && (
17
+ (showToCust || saveToDevice) && (
20
18
  Platform.OS === 'ios'
21
19
  ? (
22
20
  <BlurView
@@ -24,12 +22,12 @@ const ImageIndicators = (
24
22
  style={[styles.ImageOverlayPill, { width: showToCust && saveToDevice ? 50 : 24 }]}
25
23
  pointerEvents='none'
26
24
  >
27
- {allowShowToCustomer && showToCust && (
25
+ {showToCust && (
28
26
  <View style={[styles.OverlayIconCircle, styles.OverlayIconCircleEye]}>
29
27
  <Icons.IconEye_WithPad size={16} fill={colors.white} fillOpacity={1} />
30
28
  </View>
31
29
  )}
32
- {allowSaveToDevice && saveToDevice && (
30
+ {saveToDevice && (
33
31
  <View style={[styles.OverlayIconCircle]}>
34
32
  <Icons.IconDownloadDone2 size={16} fill={colors.white} fillOpacity={1} />
35
33
  </View>
@@ -42,12 +40,12 @@ const ImageIndicators = (
42
40
  backgroundColor: 'rgba(0,0,0,0.35)'
43
41
  }]} pointerEvents='none'
44
42
  >
45
- {allowShowToCustomer && showToCust && (
43
+ {showToCust && (
46
44
  <View style={[styles.OverlayIconCircle, styles.OverlayIconCircleEye]}>
47
45
  <Icons.IconEye_WithPad size={16} fill={colors.white} fillOpacity={1} />
48
46
  </View>
49
47
  )}
50
- {allowSaveToDevice && saveToDevice && (
48
+ {saveToDevice && (
51
49
  <View style={[styles.OverlayIconCircle]}>
52
50
  <Icons.IconDownloadDone2 size={16} fill={colors.white} fillOpacity={1} />
53
51
  </View>
@@ -111,7 +111,7 @@ const SingleImage = (
111
111
  }
112
112
 
113
113
  if (newValue !== initValue) {
114
- console.log("*** RC: SingleImage onDoneEditingInput: field='" + field + "' changed from '" + initValue + "' to '" + newValue + "'")
114
+ //console.log("SingleImage onDoneEditingInput: field='" + field + "' changed from '" + initValue + "' to '" + newValue + "'")
115
115
  Analytics.logEvent('mip_singleImage_' + aType, {
116
116
  source_page: 'MultiImagePicker',
117
117
  initValue,
@@ -210,7 +210,7 @@ const SingleImage = (
210
210
  <Image
211
211
  resizeMode='cover'
212
212
  style={[styles.Image, { width: '100%', height: '100%' }]}
213
- source={{ uri: 'file://' + imagePath + '?x=' + version + '-' + (cacheVersion || 0) }}
213
+ source={{ uri: Api.getApi().fullImagePath(imagePath) + '?x=' + version + '-' + (cacheVersion || 0) }}
214
214
  />
215
215
  <ImageIndicators
216
216
  allowShowToCustomer={allowShowToCustomer}
@@ -253,7 +253,7 @@ const SingleImage = (
253
253
  <ImageDetailsModal
254
254
  visible={showDetailsModal}
255
255
  onClose={closeDetails}
256
- imageUri={'file://' + imagePath + '?x=' + version + '-' + (cacheVersion || 0)}
256
+ imageUri={Api.getApi().fullImagePath(imagePath) + '?x=' + version + '-' + (cacheVersion || 0)}
257
257
  initialTitle={title}
258
258
  initialDesc={desc}
259
259
  titleEditable={titleEditable}
@@ -1,5 +1,5 @@
1
1
  import React, { useCallback, useState } from 'react'
2
- import { Modal, View, StyleSheet, Text } from 'react-native'
2
+ import { Modal, View, StyleSheet, Text, Platform } from 'react-native'
3
3
  import { colors, stdStyles } from '@supportworks/app-styler'
4
4
  import { CheckBox, CommonButton } from '@supportworks/core-controls'
5
5
  import { Icons } from '@supportworks/icon-library'
@@ -9,7 +9,7 @@ const UploadWarningModal = (
9
9
  visible = false,
10
10
  onClose = null
11
11
  }) => {
12
- const [skipInfoDialog, setSkipInfoDialog] = useState(false)
12
+ const [skipInfoDialog, setSkipInfoDialog] = useState(true)
13
13
 
14
14
  const handleClose = useCallback(() => {
15
15
  if (onClose) onClose(skipInfoDialog)
@@ -61,7 +61,7 @@ const styles = StyleSheet.create({
61
61
  ModalView: {
62
62
  flex: 1,
63
63
  justifyContent: 'center',
64
- alignItems: 'center'
64
+ alignItems: 'center',
65
65
  },
66
66
  InfoDialogContent: {
67
67
  backgroundColor: 'white',
@@ -77,7 +77,14 @@ const styles = StyleSheet.create({
77
77
  },
78
78
  elevation: 8,
79
79
  maxWidth: '80%',
80
- width: 334
80
+ width: 334,
81
+
82
+ ...Platform.select({
83
+ android: {
84
+ borderWidth: 2,
85
+ borderColor: colors.black05,
86
+ }
87
+ })
81
88
  },
82
89
  InfoDialogIconRow: {
83
90
  alignItems: 'center',